You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by cs...@apache.org on 2015/09/11 02:40:14 UTC
[1/2] incubator-apex-core git commit: APEX-112 #resolve null values
should not converted to the string "null",
and added null check on the beanutils converters
Repository: incubator-apex-core
Updated Branches:
refs/heads/devel-3 6c2425948 -> 97cbef6c7
APEX-112 #resolve null values should not converted to the string "null", and added null check on the beanutils converters
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/ac25fbaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/ac25fbaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/ac25fbaa
Branch: refs/heads/devel-3
Commit: ac25fbaa63844e6760a90711a956402388cd22fa
Parents: 6c24259
Author: David Yan <da...@datatorrent.com>
Authored: Thu Sep 10 16:27:46 2015 -0700
Committer: David Yan <da...@datatorrent.com>
Committed: Thu Sep 10 16:49:52 2015 -0700
----------------------------------------------------------------------
.../src/main/java/com/datatorrent/stram/StringCodecs.java | 9 ++++++---
.../java/com/datatorrent/stram/webapp/StramWebServices.java | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ac25fbaa/engine/src/main/java/com/datatorrent/stram/StringCodecs.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/StringCodecs.java b/engine/src/main/java/com/datatorrent/stram/StringCodecs.java
index eb31c3d..0d5e359 100644
--- a/engine/src/main/java/com/datatorrent/stram/StringCodecs.java
+++ b/engine/src/main/java/com/datatorrent/stram/StringCodecs.java
@@ -54,6 +54,9 @@ public class StringCodecs
@SuppressWarnings("unchecked")
public Object convert(Class type, Object value)
{
+ if (value == null) {
+ return null;
+ }
for (Class<?> clazz = value.getClass(); clazz != null; clazz = clazz.getSuperclass()) {
Class<? extends StringCodec> codec = codecs.get(clazz);
if (codec == null) {
@@ -84,7 +87,7 @@ public class StringCodecs
@Override
public Object convert(Class type, Object value)
{
- return URI.create(value.toString());
+ return value == null ? null : URI.create(value.toString());
}
}, URI.class);
}
@@ -124,7 +127,7 @@ public class StringCodecs
@Override
public Object convert(Class type, Object value)
{
- return codecInstance.fromString(value.toString());
+ return value == null ? null : codecInstance.fromString(value.toString());
}
}, entry.getKey());
@@ -150,7 +153,7 @@ public class StringCodecs
@Override
public Object convert(Class type, Object value)
{
- return codecInstance.fromString(value.toString());
+ return value == null ? null : codecInstance.fromString(value.toString());
}
}, clazz);
http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/ac25fbaa/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
----------------------------------------------------------------------
diff --git a/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java b/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
index 97edf39..117681e 100644
--- a/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
+++ b/engine/src/main/java/com/datatorrent/stram/webapp/StramWebServices.java
@@ -554,7 +554,7 @@ public class StramWebServices
Iterator<String> keys = request.keys();
while (keys.hasNext()) {
String key = keys.next();
- String val = request.getString(key);
+ String val = request.isNull(key) ? null : request.getString(key);
LOG.debug("Setting property for {}: {}={}", operatorName, key, val);
dagManager.setOperatorProperty(operatorName, key, val);
}
@@ -582,7 +582,7 @@ public class StramWebServices
Iterator<String> keys = request.keys();
while (keys.hasNext()) {
String key = keys.next();
- String val = request.getString(key);
+ String val = request.isNull(key) ? null : request.getString(key);
dagManager.setPhysicalOperatorProperty(operatorId, key, val);
}
}
[2/2] incubator-apex-core git commit: Merge branch 'APEX-112' into
devel-3
Posted by cs...@apache.org.
Merge branch 'APEX-112' into devel-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/97cbef6c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/97cbef6c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/97cbef6c
Branch: refs/heads/devel-3
Commit: 97cbef6c7294e80f8966fd812fd1b642cba477cf
Parents: 6c24259 ac25fba
Author: Chandni Singh <cs...@apache.org>
Authored: Thu Sep 10 17:38:39 2015 -0700
Committer: Chandni Singh <cs...@apache.org>
Committed: Thu Sep 10 17:38:39 2015 -0700
----------------------------------------------------------------------
.../src/main/java/com/datatorrent/stram/StringCodecs.java | 9 ++++++---
.../java/com/datatorrent/stram/webapp/StramWebServices.java | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------