cvs commit: xml-axis-wsif/java/src/org/apache/wsif/providers/java WSIFOperation_Java.java

[owenb]

owenb       2002/11/01 07:28:11

  Modified:    java/src/org/apache/wsif/providers/ejb
                        WSIFOperation_EJB.java
               java/src/org/apache/wsif/providers/java
                        WSIFOperation_Java.java
  Log:
  Fix to getCompatibleObject method to allow single character Strings to be converted
  to java.lang.Characters when the method compatible class is char.class. Previously 
this
  had only worked with the compatible class being java.lang.Character.class
  
  Revision  Changes    Path
  1.20      +1 -1      
xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFOperation_EJB.java
  
  Index: WSIFOperation_EJB.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/ejb/WSIFOperation_EJB.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- WSIFOperation_EJB.java    24 Oct 2002 16:09:07 -0000      1.19
  +++ WSIFOperation_EJB.java    1 Nov 2002 15:28:11 -0000       1.20
  @@ -818,7 +818,7 @@
       protected Object getCompatibleObject(Class cls, Object obj) {
           Trc.entry(this,cls,obj);
           // String -> Character
  -        if (cls.equals(java.lang.Character.class)
  +        if ((cls.equals(java.lang.Character.class) || cls.equals(char.class))
               && obj.getClass().equals(java.lang.String.class)) {
               Character charArg = stringToCharacter((String) obj);
               if (charArg == null) {
  
  
  
  1.22      +1 -1      
xml-axis-wsif/java/src/org/apache/wsif/providers/java/WSIFOperation_Java.java
  
  Index: WSIFOperation_Java.java
  ===================================================================
  RCS file: 
/home/cvs/xml-axis-wsif/java/src/org/apache/wsif/providers/java/WSIFOperation_Java.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WSIFOperation_Java.java   24 Oct 2002 16:09:07 -0000      1.21
  +++ WSIFOperation_Java.java   1 Nov 2002 15:28:11 -0000       1.22
  @@ -790,7 +790,7 @@
       protected Object getCompatibleObject(Class cls, Object obj) {
        Trc.entry(this,cls,obj);
           // String -> Character
  -        if (cls.equals(java.lang.Character.class)
  +        if ((cls.equals(java.lang.Character.class) || cls.equals(char.class))
               && obj.getClass().equals(java.lang.String.class)) {
               Character charArg = stringToCharacter((String) obj);
               if (charArg == null) {