UpdateForProfileHandles (#219)

Signed-off-by: John Eberhard <[email protected]>

src/main/java/com/ibm/as400/access/AS400ImplNative.java

@@ -28,6 +28,37 @@ class AS400ImplNative
     }
 
     static native byte[] signonNative(byte[] userId) throws NativeException;
+    /* Swap to a user profile using the userid and password */
+    /* The swapToPH is the profile handle generated from the userid and passowrd */
+    /* The swapFromPH is the profile handle to get back to the original profile handle */
     static native void swapToNative(byte[] userId, byte[] bytes, byte[] swapToPH, byte[] swapFromPH) throws NativeException;
+    /* Swap using a profile handle and free the old handle */
+    /* swapToPH is the old profile handle that will be released.  This handle will also be released. */
+    /* swapFromPH is the profile to swap to */ 
     static native void swapBackNative(byte[] swapToPH, byte[] swapFromPH) throws NativeException;
+
+
+    /* New method to create a profile handle.   This method is only available after IBM 7.5. 
+     * The create profile handle should be used with SwapToProfileHandleNative to do the
+     * swap.
+     * This profile handle should be released when the AS400 object is closed */
+    static native void createProfileHandleNative(byte[] profileHandle, String userId, char[] password, char[] additionalAuthenticationFactor) throws NativeException;
+
+    /* Swap to the user associated with swapToPH.  The swapFromPH is the handle for the original user, */
+    /* which is used with swapping back using swapBackAndReleaseNative */ 
+    static native void swapToProfileHandleNative(byte[] swapToPH, byte[] swapFromPH) throws NativeException;
+
+    /* Swap back to the original profile handle and free it */ 
+    static native void swapBackAndReleaseNative(byte[] swapFromPH) throws NativeException;
+
+    /* Create profile handle with additional authentication information. 
+     * This method is only available after IBM 7.5. 
+     * This profile handle should be released when the AS400 object is done with it.  */
+    public static native void createProfileHandle2Native(byte[] profileHandle, 
+    		String userId, char[] password, char[] additionalAuthenticationFactor,
+    		String verificationId, String remoteIpAddress, int jRemotePort,   String localIpAddress, int jLocalPort ) throws NativeException;
+
+
+
+
 }

src/main/java/com/ibm/as400/access/EnhancedProfileTokenImplNative.java

@@ -106,7 +106,7 @@ public class EnhancedProfileTokenImplNative
      * @exception RetrieveFailedException If errors occur while generating the
      *                                    token.
      */
-    public static native byte[] nativeCreateToken(
+     static native byte[] nativeCreateToken(
             String user, 
             char[] password, 
             char[] additionalAuthenticationFactor,
@@ -195,7 +195,7 @@ public static native byte[] nativeCreateToken(
     * @exception RetrieveFailedException If errors occur while generating the
     *                                    token.
     */
-    public static native byte[] nativeCreateTokenSpecialPassword(
+    static native byte[] nativeCreateTokenSpecialPassword(
             String user, 
             char[] password, 
             char[] additionalAuthenticationFactor,
@@ -225,7 +225,7 @@ public static native byte[] nativeCreateTokenSpecialPassword(
      * 
      * @throws SwapFailedException If errors occur while swapping thread identity.
      */
-    public static native void nativeSwap(
+    static native void nativeSwap(
             byte[] token,
             String verificationId,
             String remoteIpAddress) throws SwapFailedException;
@@ -262,7 +262,7 @@ public static native void nativeSwap(
      * @exception RetrieveFailedException If errors occur while generating the
      *                                    token.
      */
-    public static native byte[] nativeCreateTokenFromToken(
+     static native byte[] nativeCreateTokenFromToken(
             byte[] token, 
             String verificationId,
             String remoteIpAddress,

src/main/java/com/ibm/as400/access/ProfileTokenImplNative.java

@@ -485,7 +485,6 @@ native byte[] nativeCreateToken(
     // @exception  RetrieveFailedException  If errors occur while generating
     // the token.
 
-    // TODO:  Write native code in /osxpf/v7r5m0.xpf/cur/cmvc/base.pgm/yjsp.xpf
     native byte[] nativeCreateTokenChar(
             String user, 
             char[] password, 

src/main/java/com/ibm/as400/access/Trace.java

@@ -691,7 +691,7 @@ private static void logSource(Object source, StringBuffer buffer) {           //
       }
       buffer.append(simpleName);
       buffer.append('@');
-      buffer.append(source.hashCode());
+      buffer.append(System.identityHashCode(source));
       buffer.append("] ");
   }
 
@@ -705,7 +705,7 @@ private static void logSource(Object source, PrintWriter writer) {            //
       }
       writer.print(simpleName);
       writer.print('@');
-      writer.print(source.hashCode());
+      writer.print(System.identityHashCode(source));
       writer.print("] ");
   }
 

src/main/java/com/ibm/as400/access/jdbcClient/Main.java

@@ -2762,6 +2762,7 @@ private Object callMethod(String left, PrintStream printStreamForCallMethod) {
     try {
       boolean methodFound = false;
       StringBuffer possibleErrors = new StringBuffer(); 
+      int exceptionCount = 0; 
 
       Object variable = null;
       int paramIndex = left.indexOf("(");
@@ -3047,11 +3048,11 @@ private Object callMethod(String left, PrintStream printStreamForCallMethod) {
                         try {
                           methods[m].setAccessible(true);
                           variable = methods[m].invoke(callObject, parameters);
-                        } catch (Exception e) {
+                        } catch (Throwable e) {
                           if (e instanceof java.lang.reflect.InvocationTargetException) {
                             Throwable nextException = e.getCause(); 
-                            if (nextException != null && (nextException instanceof Exception )) { 
-                              e =  (Exception ) nextException; 
+                            if (nextException != null ) { 
+                              e =  nextException; 
                             }
                           }
                           if (e instanceof XAException) {
@@ -3060,7 +3061,9 @@ private Object callMethod(String left, PrintStream printStreamForCallMethod) {
                           possibleErrors.append("Exception "+e+"\n");
                           if (printStackTrace_) printStackTraceToStringBuffer(e, possibleErrors);
                           possibleErrors.append("Calling method " + methodName
-                              + " with " + methodParameters + " failed\n");
+                              + " with " + methodParameters + " failed exception in Exeception"+exceptionCount+"\n");
+                          addVariable("Exception"+exceptionCount, e);
+                          exceptionCount++; 
                           methodFound = false;
                         }
                       } else {