You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2013/04/25 17:17:42 UTC
svn commit: r1475821 -
/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Author: coheigea
Date: Thu Apr 25 15:17:41 2013
New Revision: 1475821
URL: http://svn.apache.org/r1475821
Log:
Merged revisions 1475816 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes
........
r1475816 | coheigea | 2013-04-25 16:10:04 +0100 (Thu, 25 Apr 2013) | 18 lines
Merged revisions 1475813 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........
r1475813 | coheigea | 2013-04-25 16:07:46 +0100 (Thu, 25 Apr 2013) | 10 lines
Merged revisions 1475811 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1475811 | coheigea | 2013-04-25 16:06:00 +0100 (Thu, 25 Apr 2013) | 2 lines
Fixing incorrect setting of StaX thresholds
........
........
........
Modified:
cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
Modified: cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?rev=1475821&r1=1475820&r2=1475821&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ cxf/branches/2.5.x-fixes/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Thu Apr 25 15:17:41 2013
@@ -142,8 +142,8 @@ public final class StaxUtils {
OUTPUT_FACTORY_POOL = new ArrayBlockingQueue<XMLOutputFactory>(i);
//old names
- innerElementCountThreshold = getInteger(INNER_ELEMENT_LEVEL_SYSTEM_PROP, innerElementCountThreshold);
- innerElementLevelThreshold = getInteger(INNER_ELEMENT_COUNT_SYSTEM_PROP, innerElementLevelThreshold);
+ innerElementCountThreshold = getInteger(INNER_ELEMENT_COUNT_SYSTEM_PROP, innerElementCountThreshold);
+ innerElementLevelThreshold = getInteger(INNER_ELEMENT_LEVEL_SYSTEM_PROP, innerElementLevelThreshold);
//new names
innerElementCountThreshold = getInteger(MAX_CHILD_ELEMENTS, innerElementCountThreshold);
innerElementLevelThreshold = getInteger(MAX_ELEMENT_DEPTH, innerElementLevelThreshold);