[openejb-scm] [2645] trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba: Ported fix from 2.1 branch

[dblevins]

Title: [2645] trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba: Ported fix from 2.1 branch

Revision

2645

Author

dblevins

Date

2006-05-05 13:55:38 -0400 (Fri, 05 May 2006)

Log Message

Ported fix from 2.1 branch

Modified Paths

• trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAEJBMetaData.java
• trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAHandle.java
• trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAHomeHandle.java
• trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/util/DynamicStubClassLoader.java

Diff

Modified: trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAEJBMetaData.java (2644 => 2645)

--- trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAEJBMetaData.java	2006-05-05 17:50:08 UTC (rev 2644)
+++ trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAEJBMetaData.java	2006-05-05 17:55:38 UTC (rev 2645)
@@ -52,6 +52,9 @@
  * @version $Revision$ $Date$
  */
 public class CORBAEJBMetaData implements EJBMetaData, java.io.Serializable {
+
+    private static final long serialVersionUID = 8085488135161906381L;
+
     public final static byte ENTITY = 1;
     public final static byte STATEFUL = 2;
     public final static byte STATELESS = 3;

Modified: trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAHandle.java (2644 => 2645)

--- trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAHandle.java	2006-05-05 17:50:08 UTC (rev 2644)
+++ trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAHandle.java	2006-05-05 17:55:38 UTC (rev 2645)
@@ -72,6 +72,9 @@
  * @version $Revision$ $Date$
  */
 public class CORBAHandle implements Handle, Serializable {
+
+    private static final long serialVersionUID = -3390719015323727224L;
+
     private String ior;
     private Object primaryKey;
 

Modified: trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAHomeHandle.java (2644 => 2645)

--- trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAHomeHandle.java	2006-05-05 17:50:08 UTC (rev 2644)
+++ trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/CORBAHomeHandle.java	2006-05-05 17:55:38 UTC (rev 2645)
@@ -71,6 +71,9 @@
  * @version $Revision$ $Date$
  */
 public class CORBAHomeHandle implements HomeHandle, Serializable {
+
+    private static final long serialVersionUID = -5537884768260058215L;
+
     private String ior;
 
     public CORBAHomeHandle(String ior) {
@@ -122,4 +125,4 @@
             throw new org.omg.CORBA.MARSHAL("Cound not find handle delegate in jndi at java:comp/HandleDelegate", 0, org.omg.CORBA.CompletionStatus.COMPLETED_YES);
         }
     }
-}
\ No newline at end of file
+}

Modified: trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/util/DynamicStubClassLoader.java (2644 => 2645)

--- trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/util/DynamicStubClassLoader.java	2006-05-05 17:50:08 UTC (rev 2644)
+++ trunk/openejb2/modules/openejb-core/src/main/java/org/openejb/corba/util/DynamicStubClassLoader.java	2006-05-05 17:55:38 UTC (rev 2645)
@@ -171,8 +171,7 @@
                 return 0;
             }
 
-            if (method.getReturnType().equals(String[].class) && method.getParameterTypes().length == 0 && method.getName() == "_ids")
-            {
+            if (method.getReturnType().equals(String[].class) && method.getParameterTypes().length == 0 && method.getName().equals("_ids")) {
                 return 2;
             }