Skip to content

Commit 2184038

Browse files
pmalveskimchy
authored andcommitted
- Fix for [1393]
1 parent bb2ffc6 commit 2184038

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

plugins/river/twitter/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ configurations {
3333
dependencies {
3434
compile project(':elasticsearch')
3535

36-
compile('org.twitter4j:twitter4j-core:2.1.10') { transitive = false }
37-
distLib('org.twitter4j:twitter4j-core:2.1.10') { transitive = false }
36+
compile('org.twitter4j:twitter4j-core:2.2.4') { transitive = false }
37+
compile('org.twitter4j:twitter4j-stream:2.2.4') { transitive = false }
38+
compile('org.twitter4j:twitter4j-core:2.2.4') { transitive = false }
39+
compile('org.twitter4j:twitter4j-stream:2.2.4') { transitive = false }
3840
}
3941

4042
task explodedDist(dependsOn: [jar], description: 'Builds the plugin zip file') << {
@@ -129,4 +131,4 @@ uploadArchives {
129131

130132
eclipseClasspath {
131133
defaultOutputDir = file('build/eclipse-build')
132-
}
134+
}

plugins/river/twitter/src/main/java/org/elasticsearch/river/twitter/TwitterRiver.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public class TwitterRiver extends AbstractRiverComponent implements River {
138138
if (follow != null) {
139139
if (follow instanceof List) {
140140
List lFollow = (List) follow;
141-
int[] followIds = new int[lFollow.size()];
141+
long[] followIds = new long[lFollow.size()];
142142
for (int i = 0; i < lFollow.size(); i++) {
143143
Object o = lFollow.get(i);
144144
if (o instanceof Number) {
@@ -150,7 +150,7 @@ public class TwitterRiver extends AbstractRiverComponent implements River {
150150
filterQuery.follow(followIds);
151151
} else {
152152
String[] ids = Strings.commaDelimitedListToStringArray(follow.toString());
153-
int[] followIds = new int[ids.length];
153+
long[] followIds = new long[ids.length];
154154
for (int i = 0; i < ids.length; i++) {
155155
followIds[i] = Integer.parseInt(ids[i]);
156156
}
@@ -265,11 +265,9 @@ public class TwitterRiver extends AbstractRiverComponent implements River {
265265
}
266266
currentRequest = client.prepareBulk();
267267
if (streamType.equals("filter") || filterQuery != null) {
268-
try {
268+
269269
stream.filter(filterQuery);
270-
} catch (TwitterException e) {
271-
logger.warn("failed to create filter stream based on query, disabling river....");
272-
}
270+
273271
} else if (streamType.equals("firehose")) {
274272
stream.firehose(0);
275273
} else {
@@ -309,11 +307,8 @@ private void reconnect() {
309307
stream.addListener(new StatusHandler());
310308

311309
if (streamType.equals("filter") || filterQuery != null) {
312-
try {
313-
stream.filter(filterQuery);
314-
} catch (TwitterException e) {
315-
logger.warn("failed to create filter stream based on query, disabling river....");
316-
}
310+
stream.filter(filterQuery);
311+
317312
} else if (streamType.equals("firehose")) {
318313
stream.firehose(0);
319314
} else {

0 commit comments

Comments
 (0)