svn commit: r1214118 - /axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java

2011-12-14 Thread sagara 
Author: sagara
Date: Wed Dec 14 08:57:18 2011
New Revision: 1214118

URL: http://svn.apache.org/viewvc?rev=1214118&view=rev
Log:
Applied patch for AXIS2-5212.

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?rev=1214118&r1=1214117&r2=1214118&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
 Wed Dec 14 08:57:18 2011
@@ -79,10 +79,9 @@ public class SimpleTypeMapper {
 
 private static final String SQL_DATE_FORMAT = "-MM-dd";
 
-public static Object getSimpleTypeObject(Class parameter, OMElement value) 
{
+public static Object getSimpleTypeObject(Class parameter, String text) {
 String name = parameter.getName();
-String text = value.getText();
-
+
 if(name.equals(STRING)) {
 return text;
 } else  if (text == null || text.length() == 0) {
@@ -168,6 +167,10 @@ public class SimpleTypeMapper {
 }
 }
 
+public static Object getSimpleTypeObject(Class parameter, OMElement value) 
{
+return getSimpleTypeObject(parameter, value.getText());
+}
+
 public static ArrayList getArrayList(OMElement element, String localName) {
 Iterator childitr = element.getChildrenWithName(new QName(localName));
 ArrayList list = new ArrayList();

svn commit: r1214119 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java

2011-12-14 Thread sagara 
Author: sagara
Date: Wed Dec 14 09:02:48 2011
New Revision: 1214119

URL: http://svn.apache.org/viewvc?rev=1214119&view=rev
Log:
Merged r1214118 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 09:02:48 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1214118

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java?rev=1214119&r1=1214118&r2=1214119&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
 Wed Dec 14 09:02:48 2011
@@ -71,10 +71,9 @@ public class SimpleTypeMapper {
 private static final String YEAR = 
"org.apache.axis2.databinding.types.Year";
 private static final String YEAR_MONTH = 
"org.apache.axis2.databinding.types.YearMonth";
 
-public static Object getSimpleTypeObject(Class parameter, OMElement value) 
{
+public static Object getSimpleTypeObject(Class parameter, String text) {
 String name = parameter.getName();
-String text = value.getText();
-
+
 if(name.equals(STRING)) {
 return text;
 } else  if (text == null || text.length() == 0) {
@@ -155,6 +154,10 @@ public class SimpleTypeMapper {
 }
 }
 
+public static Object getSimpleTypeObject(Class parameter, OMElement value) 
{
+return getSimpleTypeObject(parameter, value.getText());
+}
+
 public static ArrayList getArrayList(OMElement element, String localName) {
 Iterator childitr = element.getChildrenWithName(new QName(localName));
 ArrayList list = new ArrayList();

svn commit: r1214235 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java

2011-12-14 Thread sagara 
Author: sagara
Date: Wed Dec 14 13:25:48 2011
New Revision: 1214235

URL: http://svn.apache.org/viewvc?rev=1214235&view=rev
Log:
Merged r1157767 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 13:25:48 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1214118
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1147485,1149224,1149491,1149578,1150055,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1205939,1208901,1209034,1213639,1
 214118

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java?rev=1214235&r1=1214234&r2=1214235&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/rpc/receivers/RPCMessageReceiver.java
 Wed Dec 14 13:25:48 2011
@@ -139,8 +139,10 @@ public class RPCMessageReceiver extends 
 
 if (WSDL2Constants.MEP_URI_ROBUST_IN_ONLY.equals(
 op.getMessageExchangePattern())){
-OMElement bodyChild = 
fac.createOMElement(outMessage.getAxisMessage().getName(), ns);
-envelope.getBody().addChild(bodyChild);
+if (outMessage.getAxisMessage().getName() != null) {
+OMElement bodyChild = 
fac.createOMElement(outMessage.getAxisMessage().getName(), ns);
+envelope.getBody().addChild(bodyChild);
+}
 outMessage.setEnvelope(envelope);
 return;
 }