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

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

Author: dimitris at jboss.org
Date: 2007-06-06 17:05:55 -0400 (Wed, 06 Jun 2007)
New Revision: 63377

Modified:
   branches/Branch_4_2/iiop/src/main/org/jboss/iiop/rmi/ContainerAnalysis.java
Log:
JBAS-4473, java to IDL mapping erroneously treats a 'get' method as an attribute

Modified: branches/Branch_4_2/iiop/src/main/org/jboss/iiop/rmi/ContainerAnalysis.java
===================================================================
--- branches/Branch_4_2/iiop/src/main/org/jboss/iiop/rmi/ContainerAnalysis.java	2007-06-06 19:25:30 UTC (rev 63376)
+++ branches/Branch_4_2/iiop/src/main/org/jboss/iiop/rmi/ContainerAnalysis.java	2007-06-06 21:05:55 UTC (rev 63377)
@@ -21,34 +21,14 @@
  */
 package org.jboss.iiop.rmi;
 
-import org.omg.CORBA.ORB;
-import org.omg.CORBA.TCKind;
-import org.omg.CORBA.TypeCode;
-import org.omg.CORBA.AttributeMode;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.ObjectOutputStream;
+import java.io.Externalizable;
 import java.io.ObjectStreamClass;
 import java.io.Serializable;
-import java.io.Externalizable;
-import java.io.IOException;
-
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Map;
-import java.util.WeakHashMap;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.Iterator;
 
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-
 /**
  *  Common base class of ValueAnalysis and InterfaceAnalysis.
  *
@@ -56,6 +36,7 @@
  *  Specification", version 1.1 (01-06-07).
  *      
  *  @author <a href="mailto:osh at sparre.dk">Ole Husgaard</a>
+ *  @author <a href="mailto:dimitris at jboss.org">Dimitris Andreadis</a>
  *  @version $Revision$
  */
 public abstract class ContainerAnalysis
@@ -325,9 +306,11 @@
    protected boolean isAccessor(Method m)
    {
      Class returnType = m.getReturnType();
- 
-     if (!m.getName().startsWith("get"))
-        if (!m.getName().startsWith("is") || !(returnType == Boolean.TYPE))
+     // JBAS-4473, look for get<name>()
+     String name = m.getName();
+     if (!(name.startsWith("get") && name.length() > "get".length()))
+        if (!(name.startsWith("is") && name.length() > "is".length())
+              || !(returnType == Boolean.TYPE))
            return false;
      if (returnType == Void.TYPE)
          return false;
@@ -342,7 +325,9 @@
     */
    protected boolean isMutator(Method m)
    {
-     if (!m.getName().startsWith("set"))
+     // JBAS-4473, look for set<name>()
+     String name = m.getName();
+     if (!(name.startsWith("set") && name.length() > "set".length()))
          return false;
      if (m.getReturnType() != Void.TYPE)
          return false;