svn commit: r1471643 - in /accumulo/branches/1.5/proxy/src: main/java/org/apache/accumulo/proxy/ProxyServer.java test/java/org/apache/accumulo/proxy/SimpleTest.java

[kturner]

Author: kturner
Date: Wed Apr 24 20:27:50 2013
New Revision: 1471643

URL: http://svn.apache.org/r1471643
Log:
ACCUMULO-1340 made proxy update call tolerate unknown session ids

Modified:
    
accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
    
accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java

Modified: 
accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java?rev=1471643&r1=1471642&r2=1471643&view=diff
==============================================================================
--- 
accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
 (original)
+++ 
accumulo/branches/1.5/proxy/src/main/java/org/apache/accumulo/proxy/ProxyServer.java
 Wed Apr 24 20:27:50 2013
@@ -1101,7 +1101,7 @@ public class ProxyServer implements Accu
   
   private static final ColumnVisibility EMPTY_VIS = new ColumnVisibility();
   
-  private void addCellsToWriter(Map<ByteBuffer,List<ColumnUpdate>> cells, 
BatchWriterPlusException bwpe) throws MutationsRejectedException {
+  private void addCellsToWriter(Map<ByteBuffer,List<ColumnUpdate>> cells, 
BatchWriterPlusException bwpe) {
     if (bwpe.exception != null)
       return;
     
@@ -1163,8 +1163,8 @@ public class ProxyServer implements Accu
     try {
       BatchWriterPlusException bwpe = getWriter(writer);
       addCellsToWriter(cells, bwpe);
-    } catch (Exception e) {
-      throw new TException(e);
+    } catch (UnknownWriter e) {
+      // just drop it, this is a oneway thrift call and throwing a TException 
seems to make all subsequent thrift calls fail
     }
   }
   

Modified: 
accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1471643&r1=1471642&r2=1471643&view=diff
==============================================================================
--- 
accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
 (original)
+++ 
accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
 Wed Apr 24 20:27:50 2013
@@ -380,6 +380,9 @@ public class SimpleTest {
     client.update(writer, mutation("row2", "cf", "cq", "value2"));
     client.closeWriter(writer);
     
+    // this is a oneway call, so it does not throw exceptions
+    client.update(writer, mutation("row2", "cf", "cq", "value2"));
+
     try {
       client.flush(writer);
       fail("exception not thrown");