You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streams.apache.org by sb...@apache.org on 2014/09/17 23:59:06 UTC
[1/2] git commit: Merge branch 'STREAMS-164'
Repository: incubator-streams
Updated Branches:
refs/heads/STREAMS-177 [created] dc5e7de3c
Merge branch 'STREAMS-164'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/b4d71241
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/b4d71241
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/b4d71241
Branch: refs/heads/STREAMS-177
Commit: b4d71241b36806ddc02ffaa90892dbf4e93f254f
Parents: 35a8fbf 5bf8755
Author: sblackmon <sb...@apache.org>
Authored: Wed Sep 17 16:44:46 2014 -0500
Committer: sblackmon <sb...@apache.org>
Committed: Wed Sep 17 16:44:46 2014 -0500
----------------------------------------------------------------------
.../ElasticsearchConfigurator.java | 41 ++++-------
.../ElasticsearchPersistDeleter.java | 34 +++++----
.../ElasticsearchPersistUpdater.java | 66 +++++------------
.../ElasticsearchPersistWriter.java | 76 +++++++++++++-------
4 files changed, 98 insertions(+), 119 deletions(-)
----------------------------------------------------------------------
[2/2] git commit: addresses failing test in streams-processor-urls
Posted by sb...@apache.org.
addresses failing test in streams-processor-urls
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/dc5e7de3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/dc5e7de3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/dc5e7de3
Branch: refs/heads/STREAMS-177
Commit: dc5e7de3c5c2e2fe905928785aaf9b059df34747
Parents: b4d7124
Author: sblackmon <sb...@apache.org>
Authored: Wed Sep 17 16:58:50 2014 -0500
Committer: sblackmon <sb...@apache.org>
Committed: Wed Sep 17 16:58:50 2014 -0500
----------------------------------------------------------------------
.../src/main/java/org/apache/streams/urls/LinkResolver.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/dc5e7de3/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java
----------------------------------------------------------------------
diff --git a/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java b/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java
index 2f7646b..5497b92 100644
--- a/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java
+++ b/streams-contrib/streams-processor-urls/src/main/java/org/apache/streams/urls/LinkResolver.java
@@ -372,6 +372,12 @@ public class LinkResolver implements Serializable {
} catch (UnsupportedEncodingException uee) {
System.err.println("Unable to Decode URL. Decoding skipped.");
uee.printStackTrace();
+ } catch (NullPointerException npe) {
+ System.err.println("NPE Decoding URL. Decoding skipped.");
+ npe.printStackTrace();
+ } catch (Throwable e) {
+ System.err.println("Misc error Decoding URL. Decoding skipped.");
+ e.printStackTrace();
}
// Remove the protocol, http:// ftp:// or similar from the front