[jboss-cvs] JBossAS SVN: r77442 - branches/Branch_4_2/iiop/src/main/org/jboss/tm/iiop.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2008-08-25 11:49:09 -0400 (Mon, 25 Aug 2008)
New Revision: 77442

Modified:
   branches/Branch_4_2/iiop/src/main/org/jboss/tm/iiop/TxServerClientInterceptor.java
Log:
[JBAS-5880] - Make sure the PC is fully initialised before assigning it to the cached object

Modified: branches/Branch_4_2/iiop/src/main/org/jboss/tm/iiop/TxServerClientInterceptor.java
===================================================================
--- branches/Branch_4_2/iiop/src/main/org/jboss/tm/iiop/TxServerClientInterceptor.java	2008-08-25 15:46:53 UTC (rev 77441)
+++ branches/Branch_4_2/iiop/src/main/org/jboss/tm/iiop/TxServerClientInterceptor.java	2008-08-25 15:49:09 UTC (rev 77442)
@@ -93,15 +93,16 @@
       {
          // According to the spec, this should all be ignored
          // But we get NPEs if it doesn't contain some content
-         emptyPC = new PropagationContext();
-         emptyPC.parents = new TransIdentity[0];
-         emptyPC.current = new TransIdentity();
-         emptyPC.current.otid = new otid_t();
-         emptyPC.current.otid.formatID = 666;
-         emptyPC.current.otid.bqual_length = 1;
-         emptyPC.current.otid.tid = new byte[] { (byte) 1 };
-         emptyPC.implementation_specific_data = ORB.init().create_any();
-         emptyPC.implementation_specific_data.insert_boolean(false);
+         PropagationContext temp = new PropagationContext();
+         temp.parents = new TransIdentity[0];
+         temp.current = new TransIdentity();
+         temp.current.otid = new otid_t();
+         temp.current.otid.formatID = 666;
+         temp.current.otid.bqual_length = 1;
+         temp.current.otid.tid = new byte[] { (byte) 1 };
+         temp.implementation_specific_data = ORB.init().create_any();
+         temp.implementation_specific_data.insert_boolean(false);
+         emptyPC = temp;
       }
       return emptyPC;
    }