Author: veithen
Date: Sun Mar 11 13:39:17 2012
New Revision: 1299357
URL: http://svn.apache.org/viewvc?rev=1299357&view=rev
Log:
Merged r1173869 and r1299356 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/utils/MultirefHelper.java
axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
axis/axis2/java/core/branches/1_6/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
axis/axis2/java/core/branches/1_6/modules/saaj/ (props changed)
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 11 13:39:17 2012
@@ -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,1096134,1096136,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,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1205716,1
205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688
+/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,1096134,1096136,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,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203424,1
205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296159,1297132,1297344,1297348,1297744,1297765,1298550,1298688,1299356
Modified:
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java?rev=1299357&r1=1299356&r2=1299357&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/adb/src/org/apache/axis2/databinding/utils/MultirefHelper.java
Sun Mar 11 13:39:17 2012
@@ -146,8 +146,8 @@ public class MultirefHelper {
OMElement omElement = (OMElement)childs.next();
OMAttribute id = omElement.getAttribute(new QName("id"));
if (id != null) {
- omElement.build();
- elementMap.put(id.getAttributeValue(), omElement.detach());
+ childs.remove();
+ elementMap.put(id.getAttributeValue(), omElement);
}
}
filledTable = true;
Modified:
axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java?rev=1299357&r1=1299356&r2=1299357&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/adb/test/org/apache/axis2/databinding/utils/MultirefHelperTest.java
Sun Mar 11 13:39:17 2012
@@ -105,6 +105,7 @@ public class MultirefHelperTest extends
OMElement omElement = null;
for (Iterator iter =
generatedElement.getChildElements();iter.hasNext();){
omElement = (OMElement) iter.next();
+ iter.remove();
soapEnvelope.getBody().addChild(omElement);
}
Modified:
axis/axis2/java/core/branches/1_6/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java?rev=1299357&r1=1299356&r2=1299357&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInFaultHandler.java
Sun Mar 11 13:39:17 2012
@@ -70,6 +70,7 @@ public class AddressingInFaultHandler ex
Iterator i = element.getChildElements();
while (i.hasNext()) {
OMElement detailElement = (OMElement)i.next();
+ i.remove();
detail.addDetailEntry(detailElement);
}
}
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java?rev=1299357&r1=1299356&r2=1299357&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
Sun Mar 11 13:39:17 2012
@@ -475,6 +475,9 @@ class XMLSpineImpl implements XMLSpine {
// the requested namespace/localPart
if (om.getNamespace().getNamespaceURI().equals(namespace) &&
om.getLocalName().equals(localPart)) {
+ // _getBlockFromOMElement may replace the current element;
move the iterator to the
+ // next element to avoid ConcurrentModificationException
+ it.hasNext();
Block block = _getBlockFromOMElement(om, context,
blockFactory, false);
blocks.add(block);
}
Propchange: axis/axis2/java/core/branches/1_6/modules/saaj/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 11 13:39:17 2012
@@ -1 +1 @@
-/axis/axis2/java/core/trunk/modules/saaj: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,1096134,1096136,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,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202867,1203
424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296062,1297744,1297765,1298550
+/axis/axis2/java/core/trunk/modules/saaj: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,1096134,1096136,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,1153072,1154615,1156305,1156382,1157211,1157265,1157373,1157415,1157424,1157501,1157517,1157522,1157535,1157767,1162649,1163389,1166038,1166040,1166132,1167045,1173869,1174618,1184808,1184810,1184816,1185504,1190469,1190499,1195893,1195972,1195982,1198288,1201467,1201863,1201957,1202
867,1203424,1205716,1205939,1208901,1209034,1213180,1213639,1214118,1220630,1220888,1221716,1222510,1225161,1231465,1231470,1241031,1242238,1242249,1242511,1243831,1291158,1294991,1295084,1295479,1296062,1297744,1297765,1298550,1299356
Modified:
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1299357&r1=1299356&r2=1299357&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
Sun Mar 11 13:39:17 2012
@@ -518,10 +518,8 @@ public class SOAPElementImpl extends Nod
//We will get all the children and iteratively call the detach() on
all of 'em.
Iterator childIter = element.getChildElements();
while (childIter.hasNext()) {
- Object o = childIter.next();
- if (o instanceof org.apache.axiom.om.OMNode) {
- ((org.apache.axiom.om.OMNode)o).detach();
- }
+ childIter.next();
+ childIter.remove();
}
}
