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 2015/11/03 23:57:28 UTC
[1/2] incubator-streams git commit: resolves STREAMS-374
Repository: incubator-streams
Updated Branches:
refs/heads/master 0da1dc984 -> 83a91efb2
resolves STREAMS-374
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/a9d4a889
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/a9d4a889
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/a9d4a889
Branch: refs/heads/master
Commit: a9d4a88953f5e75e678592336097c88c9f9ae244
Parents: fba147e
Author: Steve Blackmon <sb...@apache.org>
Authored: Tue Oct 20 12:56:50 2015 -0500
Committer: Steve Blackmon <sb...@apache.org>
Committed: Tue Oct 20 12:56:50 2015 -0500
----------------------------------------------------------------------
.../apache/streams/converter/ActivityConverterUtil.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a9d4a889/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
----------------------------------------------------------------------
diff --git a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
index a9d0a3c..7db8d28 100644
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
@@ -177,9 +177,13 @@ public class ActivityConverterUtil {
Set<Class> detectedClasses = Sets.newConcurrentHashSet();
for( DocumentClassifier classifier : classifiers ) {
- List<Class> detected = classifier.detectClasses(document);
- if( detected != null && detected.size() > 0)
- detectedClasses.addAll(detected);
+ try {
+ List<Class> detected = classifier.detectClasses(document);
+ if (detected != null && detected.size() > 0)
+ detectedClasses.addAll(detected);
+ } catch( Exception e) {
+ LOGGER.warn("{} failed in method detectClasses - ()", classifier.getClass().getCanonicalName(), e);
+ }
}
return Lists.newArrayList(detectedClasses);
[2/2] incubator-streams git commit: Merge commit
'a9d4a88953f5e75e678592336097c88c9f9ae244'
Posted by sb...@apache.org.
Merge commit 'a9d4a88953f5e75e678592336097c88c9f9ae244'
* commit 'a9d4a88953f5e75e678592336097c88c9f9ae244':
resolves STREAMS-374
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/83a91efb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/83a91efb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/83a91efb
Branch: refs/heads/master
Commit: 83a91efb2b77a17bb8c7f7009768164558d078b2
Parents: 0da1dc9 a9d4a88
Author: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Authored: Tue Nov 3 16:56:22 2015 -0600
Committer: Steve Blackmon (@steveblackmon) <sb...@apache.org>
Committed: Tue Nov 3 16:56:22 2015 -0600
----------------------------------------------------------------------
.../apache/streams/converter/ActivityConverterUtil.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/83a91efb/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
----------------------------------------------------------------------
diff --cc streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
index 21dcac3,7db8d28..9f770b5
--- a/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
+++ b/streams-components/streams-converters/src/main/java/org/apache/streams/converter/ActivityConverterUtil.java
@@@ -177,15 -175,15 +177,19 @@@ public class ActivityConverterUtil
protected List<Class> detectClasses(Object document) {
- Set<Class> detectedClasses = Sets.newConcurrentHashSet();
+ // ConcurrentHashSet is preferable, but it's only in guava 15+
+ // spark 1.5.0 uses guava 14 so for the moment this is the workaround
+ // Set<Class> detectedClasses = new ConcurrentHashSet();
+ Set<Class> detectedClasses = Collections.newSetFromMap(new ConcurrentHashMap<Class, Boolean>());
+
for( DocumentClassifier classifier : classifiers ) {
- List<Class> detected = classifier.detectClasses(document);
- if( detected != null && detected.size() > 0)
- detectedClasses.addAll(detected);
+ try {
+ List<Class> detected = classifier.detectClasses(document);
+ if (detected != null && detected.size() > 0)
+ detectedClasses.addAll(detected);
+ } catch( Exception e) {
+ LOGGER.warn("{} failed in method detectClasses - ()", classifier.getClass().getCanonicalName(), e);
+ }
}
return Lists.newArrayList(detectedClasses);