svn commit: r1140346 - in /axis/axis2/java/core/branches/1_6: ./ modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java

[veithen]

Author: veithen
Date: Mon Jun 27 22:08:59 2011
New Revision: 1140346

URL: http://svn.apache.org/viewvc?rev=1140346&view=rev
Log:
Merged r1088904 to the 1.6 branch to make Axis2 1.6.1 compatible with Axiom 
1.2.12.

Modified:
    axis/axis2/java/core/branches/1_6/   (props changed)
    
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java

Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 27 22:08:59 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1085927,1087073,1088239,1088248-1088249,1088251,1088268,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072499,1072510,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085514,1085927,1087073,1088239,1088248-1088249,1088251,1088268,1088904,1091178,1091191,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448

Modified: 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java?rev=1140346&r1=1140345&r2=1140346&view=diff
==============================================================================
--- 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/message/util/XMLFaultUtils.java
 Mon Jun 27 22:08:59 2011
@@ -416,7 +416,7 @@ public class XMLFaultUtils {
                 OMBlockFactory bf =
                         
(OMBlockFactory)FactoryRegistry.getFactory(OMBlockFactory.class);
                 ArrayList<Block> list = new ArrayList<Block>();
-                Iterator it = detail.getChildElements();
+                Iterator it = detail.getDetailEntries();
                 while (it.hasNext()) {
                     DetailEntry de = (DetailEntry)it.next();
                     OMElement om = converter.toOM(de);