[jbossws-commits] JBossWS SVN: r16262 - in stack/native/branches/jbossws-native-4.0.x: modules/core/src/main/java/org/jboss/ws/core/soap and 1 other directory.

[jbossws-commits at lists.jboss.org]

Author: ropalka
Date: 2012-05-11 06:39:35 -0400 (Fri, 11 May 2012)
New Revision: 16262

Modified:
   stack/native/branches/jbossws-native-4.0.x/
   stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
   stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
Log:
Merged revisions 16228 via svnmerge from 
https://svn.jboss.org/repos/jbossws/stack/native/trunk

.......
  r16228 | ropalka | 2012-05-03 13:20:02 +0200 (Thu, 03 May 2012) | 1 line
  
  [JBWS-3470] fixing infinite loop in NodeImpl
.......



Property changes on: stack/native/branches/jbossws-native-4.0.x
___________________________________________________________________
Modified: svnmerge-integrated
   - https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16097,16099-16105,16157-16171,16182,16202-16225,16229-16246
   + https://svn.jboss.org/repos/jbossws/stack/native/trunk:1-15651,15653-15678,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15876,15878-15891,15904-15933,15935-15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16097,16099-16105,16157-16171,16182,16202-16225,16228-16246
Modified: svn:mergeinfo
   - /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16169-16171,16182,16202-16225,16229-16246
   + /stack/native/branches/asoldano:14057,14069
/stack/native/branches/ropalka:13836-13879
/stack/native/trunk:15653,15670-15677,15686,15696,15707,15714,15726-15731,15739-15740,15749-15759,15761,15775-15777,15779,15787-15791,15793,15795,15797-15804,15810,15812-15818,15821,15823-15827,15829,15831,15836-15840,15858,15861,15871,15873,15880-15883,15887,15890-15891,15904-15931,15944,15974,15988,15991,15995,15997,15999,16003,16013,16015,16021,16050-16052,16063-16065,16073-16078,16081-16085,16091-16095,16103-16105,16157-16160,16165,16169-16171,16182,16202-16225,16228-16246

Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties	2012-05-11 10:36:20 UTC (rev 16261)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/Message.properties	2012-05-11 10:39:35 UTC (rev 16262)
@@ -41,8 +41,8 @@
 INCONSISTENT_NODE=Inconsistent node, child lists not synchronized
 
 CANNOT_FIND_REFCHILD=Cannot find refChild in list of javax.xml.soap.Node children
-NO_SOAP_PARENT=Inconsistent node, has a DOM parent but no SOAP parent [{0}] {1}
-NOT_IDENTICAL_WITH_DOM_PARENT=Inconsistent node, SOAP parent is not identical with DOM parent [{0}] {1}
+NO_SOAP_PARENT=Inconsistent node, has a DOM parent but no SOAP parent [{0}]
+NOT_IDENTICAL_WITH_DOM_PARENT=Inconsistent node, SOAP parent is not identical with DOM parent [{0}]
 UNABLE_TO_CREATE_FAULT_DETAIL=Unable to create fault detail
 UNSUPPORTED_ENCODING=Unsupported encoding: {0}
 CANNOT_WRITE_SOAP_ELEMENT=Cannot write SOAP element

Modified: stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java
===================================================================
--- stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java	2012-05-11 10:36:20 UTC (rev 16261)
+++ stack/native/branches/jbossws-native-4.0.x/modules/core/src/main/java/org/jboss/ws/core/soap/NodeImpl.java	2012-05-11 10:39:35 UTC (rev 16262)
@@ -585,9 +585,9 @@
    {
       org.w3c.dom.Node domParent = domNode.getParentNode();
       if (domParent != null && soapParent == null)
-         throw new WSException(BundleUtils.getMessage(bundle, "NO_SOAP_PARENT", new Object[]{ this ,  DOMWriter.printNode(this, false)}));
+         throw new WSException(BundleUtils.getMessage(bundle, "NO_SOAP_PARENT", new Object[]{ this }));
       if (domParent != null && soapParent != null && domParent != soapParent.domNode)
-         throw new WSException(BundleUtils.getMessage(bundle, "NOT_IDENTICAL_WITH_DOM_PARENT", new Object[]{ this ,  DOMWriter.printNode(this, false)}));
+         throw new WSException(BundleUtils.getMessage(bundle, "NOT_IDENTICAL_WITH_DOM_PARENT", new Object[]{ this }));
    }
 
    // END org.w3c.dom.Node *******************************************************************************************