svn commit: r1361118 - in /flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src: main/java/org/apache/flume/source/thriftLegacy/ThriftLegacySource.java test/java/org/apache/flume/source/thriftLegacy/TestThriftLegacySource.java

[jarcec]

Author: jarcec
Date: Fri Jul 13 09:13:11 2012
New Revision: 1361118

URL: http://svn.apache.org/viewvc?rev=1361118&view=rev
Log:
FLUME-1362. Port retrying in TestThriftLegacySource not working.

(Juhani Connolly via Jarek Jarcec Cecho)

Modified:
    
flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/main/java/org/apache/flume/source/thriftLegacy/ThriftLegacySource.java
    
flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/test/java/org/apache/flume/source/thriftLegacy/TestThriftLegacySource.java

Modified: 
flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/main/java/org/apache/flume/source/thriftLegacy/ThriftLegacySource.java
URL: 
http://svn.apache.org/viewvc/flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/main/java/org/apache/flume/source/thriftLegacy/ThriftLegacySource.java?rev=1361118&r1=1361117&r2=1361118&view=diff
==============================================================================
--- 
flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/main/java/org/apache/flume/source/thriftLegacy/ThriftLegacySource.java
 (original)
+++ 
flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/main/java/org/apache/flume/source/thriftLegacy/ThriftLegacySource.java
 Fri Jul 13 09:13:11 2012
@@ -32,6 +32,7 @@ import org.apache.flume.Context;
 import org.apache.flume.CounterGroup;
 import org.apache.flume.Event;
 import org.apache.flume.EventDrivenSource;
+import org.apache.flume.FlumeException;
 import org.apache.flume.conf.Configurable;
 import org.apache.flume.source.AbstractSource;
 import org.apache.flume.event.EventBuilder;
@@ -141,8 +142,7 @@ public class ThriftLegacySource  extends
       server = new TThreadPoolServer(new TThreadPoolServer.
           Args(serverTransport).processor(processor));
     } catch (TTransportException e) {
-      e.printStackTrace();
-      return;
+      throw new FlumeException("Failed starting source", e);
     }
     ThriftHandler thriftHandler = new ThriftHandler(server);
     thriftHandlerThread = new Thread(thriftHandler);

Modified: 
flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/test/java/org/apache/flume/source/thriftLegacy/TestThriftLegacySource.java
URL: 
http://svn.apache.org/viewvc/flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/test/java/org/apache/flume/source/thriftLegacy/TestThriftLegacySource.java?rev=1361118&r1=1361117&r2=1361118&view=diff
==============================================================================
--- 
flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/test/java/org/apache/flume/source/thriftLegacy/TestThriftLegacySource.java
 (original)
+++ 
flume/trunk/flume-ng-legacy-sources/flume-thrift-source/src/test/java/org/apache/flume/source/thriftLegacy/TestThriftLegacySource.java
 Fri Jul 13 09:13:11 2012
@@ -31,6 +31,7 @@ import org.apache.flume.ChannelException
 import org.apache.flume.ChannelSelector;
 import org.apache.flume.Context;
 import org.apache.flume.Event;
+import org.apache.flume.FlumeException;
 import org.apache.flume.Transaction;
 import org.apache.flume.channel.ChannelProcessor;
 import org.apache.flume.channel.MemoryChannel;
@@ -121,7 +122,7 @@ public class TestThriftLegacySource {
 
         source.start();
         bound = true;
-      } catch (ChannelException e) {
+      } catch (FlumeException e) {
         // Assume port in use, try another one
       }
     }