You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by dk...@apache.org on 2009/04/21 04:50:12 UTC
svn commit: r766958 -
/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
Author: dkulp
Date: Tue Apr 21 02:50:12 2009
New Revision: 766958
URL: http://svn.apache.org/viewvc?rev=766958&view=rev
Log:
Handle some possible NPE's
Modified:
webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
Modified: webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java
URL: http://svn.apache.org/viewvc/webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java?rev=766958&r1=766957&r2=766958&view=diff
==============================================================================
--- webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java (original)
+++ webservices/commons/branches/modules/XmlSchema/1_4_X_BRANCH/src/main/java/org/apache/ws/commons/schema/utils/NamespaceMap.java Tue Apr 21 02:50:12 2009
@@ -22,12 +22,9 @@
public class NamespaceMap extends HashMap implements NamespacePrefixList {
- /**
- *
- */
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public NamespaceMap() {
+ public NamespaceMap() {
}
public NamespaceMap(Map map) {
@@ -44,15 +41,17 @@
}
public String getNamespaceURI(String prefix) {
- return get(prefix).toString();
+ Object o = get(prefix);
+ return o == null ? null : o.toString();
}
public String getPrefix(String namespaceURI) {
Iterator iterator = entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry entry = (Map.Entry) iterator.next();
- if (entry.getValue().toString().equals(namespaceURI)) {
- return (String) entry.getKey();
+ String val = entry.getValue() == null ? null : entry.getValue().toString();
+ if (namespaceURI.equals(val)) {
+ return (String)entry.getKey();
}
}
return null;
@@ -63,7 +62,8 @@
Iterator iterator = entrySet().iterator();
while (iterator.hasNext()) {
Map.Entry entry = (Map.Entry) iterator.next();
- if (entry.getValue().toString().equals(namespaceURI)) {
+ String val = entry.getValue() == null ? null : entry.getValue().toString();
+ if (namespaceURI.equals(val)) {
list.add(entry.getKey());
}
}