You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/09/28 15:33:00 UTC
svn commit: r819531 -
/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
Author: gbrown
Date: Mon Sep 28 13:33:00 2009
New Revision: 819531
URL: http://svn.apache.org/viewvc?rev=819531&view=rev
Log:
Restore behavior that fails gracefully when a named serializer does not exist in WTKXSerializer#get() and containsKey() (rather than throwing NPE).
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java?rev=819531&r1=819530&r2=819531&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java Mon Sep 28 13:33:00 2009
@@ -1070,7 +1070,7 @@
throw new IllegalArgumentException("name is null.");
}
- Object value;
+ Object value = null;
int i = name.lastIndexOf('.');
if (i == -1) {
@@ -1079,7 +1079,10 @@
String serializerName = name.substring(0, name.lastIndexOf('.'));
String id = name.substring(serializerName.length() + 1);
WTKXSerializer serializer = getSerializer(serializerName);
- value = serializer.get(id);
+
+ if (serializer != null) {
+ value = serializer.get(id);
+ }
}
return value;
@@ -1133,7 +1136,7 @@
throw new IllegalArgumentException("name is null.");
}
- boolean containsKey;
+ boolean containsKey = false;
int i = name.lastIndexOf('.');
if (i == -1) {
@@ -1142,7 +1145,10 @@
String serializerName = name.substring(0, name.lastIndexOf('.'));
String id = name.substring(serializerName.length() + 1);
WTKXSerializer serializer = getSerializer(serializerName);
- containsKey = serializer.containsKey(id);
+
+ if (serializer != null) {
+ containsKey = serializer.containsKey(id);
+ }
}
return containsKey;