Permalink
Browse files

Merge branch 'mbst-1671-metabroadcast-adapter' of github.com:atlasapi…

…/atlas into mbst-1671-metabroadcast-adapter

Conflicts:
	src/main/java/org/atlasapi/remotesite/RemoteSiteModuleConfigurer.java
	src/main/java/org/atlasapi/remotesite/metabroadcast/AbstractMetaBroadcastContentUpdater.java
	src/main/java/org/atlasapi/remotesite/metabroadcast/MetaBroadcastMagpieUpdater.java
	src/main/java/org/atlasapi/remotesite/metabroadcast/MetaBroadcastModule.java
	src/main/java/org/atlasapi/remotesite/metabroadcast/MetaBroadcastTwitterTopicsUpdater.java
	src/main/resources/config/environment.properties
	src/main/resources/config/environments/stage.properties
	src/test/java/org/atlasapi/remotesite/metabroadcast/MetaBroadcastTwitterTopicsUpdaterTest.java
  • Loading branch information...
2 parents df5b4da + 2ecc86e commit 027a28bd959eec2e16a336adc4f3daffb5ba66e5 @PickledChris PickledChris committed Jul 12, 2012
@@ -20,7 +20,6 @@
import org.jets3t.service.S3Service;
import org.jets3t.service.S3ServiceException;
import org.jets3t.service.model.S3Object;
-import org.springframework.beans.factory.annotation.Value;
import com.google.common.base.Function;
import com.google.common.base.Optional;
@@ -101,6 +100,7 @@ public InputStream apply(S3Object input) {
stream = object.getDataInputStream();
} catch (Exception e) {
log.record(AdapterLogEntry.errorEntry().withCause(e).withSource(getClass()).withDescription("Failed to get s3 Stream"));
+ e.printStackTrace();
}
return stream;
}
@@ -43,4 +43,4 @@ cassandra.port=9160
cassandra.connectionTimeout=60000
cassandra.requestTimeout=60000
-magpie.s3.folder=test
+magpie.s3.folder=test
@@ -131,4 +131,4 @@ public void testCreatingContentUpdatingTopics() {
}
}
-*/
+*/

0 comments on commit 027a28b

Please sign in to comment.