streams-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sblack...@apache.org
Subject [35/41] git commit: STREAMS-156 | Fixed issue in MoreoverUtils where we could get a NPE if an ID for the Activity was not set
Date Thu, 04 Sep 2014 17:12:23 GMT
STREAMS-156 | Fixed issue in MoreoverUtils where we could get a NPE if an ID for the Activity
was not set


Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/41991eea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/41991eea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/41991eea

Branch: refs/heads/pp
Commit: 41991eea5275e41690ce643194b9cdec363b9b73
Parents: 6be7f88
Author: Robert Douglas <rdouglas@w2odigital.com>
Authored: Mon Aug 25 13:19:56 2014 -0500
Committer: Robert Douglas <rdouglas@w2odigital.com>
Committed: Mon Aug 25 13:19:56 2014 -0500

----------------------------------------------------------------------
 .../src/main/java/org/apache/streams/data/util/MoreoverUtils.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/41991eea/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java
b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java
index 7edee98..52f57ff 100644
--- a/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java
+++ b/streams-contrib/streams-provider-moreover/src/main/java/org/apache/streams/data/util/MoreoverUtils.java
@@ -60,7 +60,7 @@ public class MoreoverUtils {
     }
 
     private static void fixActivityId(Activity activity) {
-        if (activity.getId().matches("\\{[a-z]*\\}")) {
+        if (activity.getId() != null && activity.getId().matches("\\{[a-z]*\\}"))
{
             activity.setId(null);
         }
     }


Mime
View raw message