You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/01/21 22:06:00 UTC
svn commit: r1726097 - in /webservices/axiom/branches/1.2.x: ./
axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
Author: veithen
Date: Thu Jan 21 21:05:59 2016
New Revision: 1726097
URL: http://svn.apache.org/viewvc?rev=1726097&view=rev
Log:
Merge r1726096 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 21 21:05:59 2016
@@ -12,3 +12,4 @@
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
+/webservices/axiom/trunk:1726096
Modified: webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java?rev=1726097&r1=1726096&r2=1726097&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java (original)
+++ webservices/axiom/branches/1.2.x/axiom-api/src/main/java/org/apache/axiom/om/impl/builder/StAXBuilder.java Thu Jan 21 21:05:59 2016
@@ -98,7 +98,7 @@ public abstract class StAXBuilder implem
// Fields for Custom Builder implementation
protected CustomBuilder customBuilderForPayload = null;
- protected Map customBuilders = null;
+ protected Map<QName,CustomBuilder> customBuilders = null;
protected int maxDepthForCustomBuilders = -1;
/**
@@ -124,7 +124,7 @@ public abstract class StAXBuilder implem
* Stores the stack trace of the code that caused a node to be discarded or consumed. This is
* only used if debug logging was enabled when builder was created.
*/
- private final Map/*<OMContainer,Throwable>*/ discardTracker = log.isDebugEnabled() ? new LinkedHashMap() : null;
+ private final Map<OMContainer,Throwable> discardTracker = log.isDebugEnabled() ? new LinkedHashMap<OMContainer,Throwable>() : null;
/**
* For internal use only.
@@ -654,9 +654,9 @@ public abstract class StAXBuilder implem
public CustomBuilder registerCustomBuilder(QName qName, int maxDepth, CustomBuilder customBuilder) {
CustomBuilder old = null;
if (customBuilders == null) {
- customBuilders = new HashMap();
+ customBuilders = new HashMap<QName,CustomBuilder>();
} else {
- old = (CustomBuilder) customBuilders.get(qName);
+ old = customBuilders.get(qName);
}
maxDepthForCustomBuilders =
(maxDepthForCustomBuilders > maxDepth) ?
@@ -683,7 +683,7 @@ public abstract class StAXBuilder implem
return null;
}
QName qName = new QName(namespace, localPart);
- return (CustomBuilder) customBuilders.get(qName);
+ return customBuilders.get(qName);
}
/** @return Returns short. */