Return-Path: X-Original-To: apmail-streams-commits-archive@minotaur.apache.org Delivered-To: apmail-streams-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1A09311F61 for ; Mon, 25 Aug 2014 20:44:34 +0000 (UTC) Received: (qmail 68152 invoked by uid 500); 25 Aug 2014 20:44:33 -0000 Delivered-To: apmail-streams-commits-archive@streams.apache.org Received: (qmail 68130 invoked by uid 500); 25 Aug 2014 20:44:33 -0000 Mailing-List: contact commits-help@streams.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@streams.incubator.apache.org Delivered-To: mailing list commits@streams.incubator.apache.org Received: (qmail 68094 invoked by uid 99); 25 Aug 2014 20:44:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Aug 2014 20:44:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Mon, 25 Aug 2014 20:44:32 +0000 Received: (qmail 67945 invoked by uid 99); 25 Aug 2014 20:44:12 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Aug 2014 20:44:12 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 59455A07167; Mon, 25 Aug 2014 20:44:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mfranklin@apache.org To: commits@streams.incubator.apache.org Date: Mon, 25 Aug 2014 20:44:12 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/3] git commit: STREAMS-156 | Fixed issue in MoreoverUtils where we could get a NPE if an ID for the Activity was not set X-Virus-Checked: Checked by ClamAV on apache.org 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/master Commit: 41991eea5275e41690ce643194b9cdec363b9b73 Parents: 6be7f88 Author: Robert Douglas Authored: Mon Aug 25 13:19:56 2014 -0500 Committer: Robert Douglas 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); } }