accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1363046 - in /accumulo/trunk/core/src/main/java/org/apache/accumulo/core: client/impl/ client/impl/thrift/ data/thrift/ master/thrift/ tabletserver/thrift/ util/shell/
Date Wed, 18 Jul 2012 19:00:12 GMT
Author: vines
Date: Wed Jul 18 19:00:12 2012
New Revision: 1363046

URL: http://svn.apache.org/viewvc?rev=1363046&view=rev
Log:
ACCUMULO-691 - improved the user checking in the connector to work around the thrift-1474
error


Modified:
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/ConnectorImpl.java
Wed Jul 18 19:00:12 2012
@@ -40,6 +40,7 @@ import org.apache.accumulo.core.client.i
 import org.apache.accumulo.core.master.state.tables.TableState;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.thrift.AuthInfo;
+import org.apache.accumulo.core.security.thrift.SecurityErrorCode;
 import org.apache.accumulo.core.util.ArgumentChecker;
 
 public class ConnectorImpl extends Connector {
@@ -76,7 +77,8 @@ public class ConnectorImpl extends Conne
       ServerClient.execute(instance, new ClientExec<ClientService.Client>() {
         @Override
         public void execute(ClientService.Client iface) throws Exception {
-          iface.authenticateUser(Tracer.traceInfo(), credentials, credentials.user, credentials.password);
+          if (!iface.authenticateUser(Tracer.traceInfo(), credentials, credentials.user,
credentials.password))
+            throw new AccumuloSecurityException("Authentication failed, access denied", SecurityErrorCode.BAD_CREDENTIALS);
         }
       });
     }

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
Wed Jul 18 19:00:12 2012
@@ -6174,6 +6174,8 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -7979,6 +7981,8 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -15295,6 +15299,8 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -16580,6 +16586,8 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -21855,7 +21863,7 @@ import org.slf4j.LoggerFactory;
                   for (int _i49 = 0; _i49 < _map48.size; ++_i49)
                   {
                     String _key50; // required
-                    String _val51; // required
+                    String _val51; // optional
                     _key50 = iprot.readString();
                     _val51 = iprot.readString();
                     struct.success.put(_key50, _val51);
@@ -21940,7 +21948,7 @@ import org.slf4j.LoggerFactory;
             for (int _i55 = 0; _i55 < _map54.size; ++_i55)
             {
               String _key56; // required
-              String _val57; // required
+              String _val57; // optional
               _key56 = iprot.readString();
               _val57 = iprot.readString();
               struct.success.put(_key56, _val57);
@@ -22701,7 +22709,7 @@ import org.slf4j.LoggerFactory;
                   for (int _i59 = 0; _i59 < _map58.size; ++_i59)
                   {
                     String _key60; // required
-                    String _val61; // required
+                    String _val61; // optional
                     _key60 = iprot.readString();
                     _val61 = iprot.readString();
                     struct.success.put(_key60, _val61);
@@ -22806,7 +22814,7 @@ import org.slf4j.LoggerFactory;
             for (int _i65 = 0; _i65 < _map64.size; ++_i65)
             {
               String _key66; // required
-              String _val67; // required
+              String _val67; // optional
               _key66 = iprot.readString();
               _val67 = iprot.readString();
               struct.success.put(_key66, _val67);
@@ -23639,6 +23647,8 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
Wed Jul 18 19:00:12 2012
@@ -849,7 +849,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i20 = 0; _i20 < _map19.size; ++_i20)
                 {
                   TKeyExtent _key21; // required
-                  List<TRange> _val22; // required
+                  List<TRange> _val22; // optional
                   _key21 = new TKeyExtent();
                   _key21.read(iprot);
                   {
@@ -1114,7 +1114,7 @@ import org.slf4j.LoggerFactory;
           for (int _i41 = 0; _i41 < _map40.size; ++_i41)
           {
             TKeyExtent _key42; // required
-            List<TRange> _val43; // required
+            List<TRange> _val43; // optional
             _key42 = new TKeyExtent();
             _key42.read(iprot);
             {

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
Wed Jul 18 19:00:12 2012
@@ -539,7 +539,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i51 = 0; _i51 < _map50.size; ++_i51)
                 {
                   TKeyExtent _key52; // required
-                  long _val53; // required
+                  long _val53; // optional
                   _key52 = new TKeyExtent();
                   _key52.read(iprot);
                   _val53 = iprot.readI64();
@@ -711,7 +711,7 @@ import org.slf4j.LoggerFactory;
           for (int _i67 = 0; _i67 < _map66.size; ++_i67)
           {
             TKeyExtent _key68; // required
-            long _val69; // required
+            long _val69; // optional
             _key68 = new TKeyExtent();
             _key68.read(iprot);
             _val69 = iprot.readI64();

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
Wed Jul 18 19:00:12 2012
@@ -2538,6 +2538,8 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -14351,6 +14353,8 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -15333,7 +15337,7 @@ import org.slf4j.LoggerFactory;
                   for (int _i74 = 0; _i74 < _map73.size; ++_i74)
                   {
                     String _key75; // required
-                    String _val76; // required
+                    String _val76; // optional
                     _key75 = iprot.readString();
                     _val76 = iprot.readString();
                     struct.options.put(_key75, _val76);
@@ -15532,7 +15536,7 @@ import org.slf4j.LoggerFactory;
             for (int _i85 = 0; _i85 < _map84.size; ++_i85)
             {
               String _key86; // required
-              String _val87; // required
+              String _val87; // optional
               _key86 = iprot.readString();
               _val87 = iprot.readString();
               struct.options.put(_key86, _val87);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
Wed Jul 18 19:00:12 2012
@@ -1002,7 +1002,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i19 = 0; _i19 < _map18.size; ++_i19)
                 {
                   String _key20; // required
-                  TableInfo _val21; // required
+                  TableInfo _val21; // optional
                   _key20 = iprot.readString();
                   _val21 = new TableInfo();
                   _val21.read(iprot);
@@ -1042,7 +1042,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i26 = 0; _i26 < _map25.size; ++_i26)
                 {
                   String _key27; // required
-                  byte _val28; // required
+                  byte _val28; // optional
                   _key27 = iprot.readString();
                   _val28 = iprot.readByte();
                   struct.badTServers.put(_key27, _val28);
@@ -1317,7 +1317,7 @@ import org.slf4j.LoggerFactory;
           for (int _i46 = 0; _i46 < _map45.size; ++_i46)
           {
             String _key47; // required
-            TableInfo _val48; // required
+            TableInfo _val48; // optional
             _key47 = iprot.readString();
             _val48 = new TableInfo();
             _val48.read(iprot);
@@ -1347,7 +1347,7 @@ import org.slf4j.LoggerFactory;
           for (int _i53 = 0; _i53 < _map52.size; ++_i53)
           {
             String _key54; // required
-            byte _val55; // required
+            byte _val55; // optional
             _key54 = iprot.readString();
             _val55 = iprot.readByte();
             struct.badTServers.put(_key54, _val55);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
Wed Jul 18 19:00:12 2012
@@ -1108,7 +1108,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i1 = 0; _i1 < _map0.size; ++_i1)
                 {
                   String _key2; // required
-                  TableInfo _val3; // required
+                  TableInfo _val3; // optional
                   _key2 = iprot.readString();
                   _val3 = new TableInfo();
                   _val3.read(iprot);
@@ -1392,7 +1392,7 @@ import org.slf4j.LoggerFactory;
           for (int _i12 = 0; _i12 < _map11.size; ++_i12)
           {
             String _key13; // required
-            TableInfo _val14; // required
+            TableInfo _val14; // optional
             _key13 = iprot.readString();
             _val14 = new TableInfo();
             _val14.read(iprot);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
Wed Jul 18 19:00:12 2012
@@ -1300,7 +1300,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i15 = 0; _i15 < _map14.size; ++_i15)
                 {
                   String _key16; // required
-                  Map<String,String> _val17; // required
+                  Map<String,String> _val17; // optional
                   _key16 = iprot.readString();
                   {
                     org.apache.thrift.protocol.TMap _map18 = iprot.readMapBegin();
@@ -1308,7 +1308,7 @@ import org.slf4j.LoggerFactory;
                     for (int _i19 = 0; _i19 < _map18.size; ++_i19)
                     {
                       String _key20; // required
-                      String _val21; // required
+                      String _val21; // optional
                       _key20 = iprot.readString();
                       _val21 = iprot.readString();
                       _val17.put(_key20, _val21);
@@ -1605,7 +1605,7 @@ import org.slf4j.LoggerFactory;
           for (int _i37 = 0; _i37 < _map36.size; ++_i37)
           {
             String _key38; // required
-            Map<String,String> _val39; // required
+            Map<String,String> _val39; // optional
             _key38 = iprot.readString();
             {
               org.apache.thrift.protocol.TMap _map40 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
@@ -1613,7 +1613,7 @@ import org.slf4j.LoggerFactory;
               for (int _i41 = 0; _i41 < _map40.size; ++_i41)
               {
                 String _key42; // required
-                String _val43; // required
+                String _val43; // optional
                 _key42 = iprot.readString();
                 _val43 = iprot.readString();
                 _val39.put(_key42, _val43);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
Wed Jul 18 19:00:12 2012
@@ -601,7 +601,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i45 = 0; _i45 < _map44.size; ++_i45)
                 {
                   String _key46; // required
-                  String _val47; // required
+                  String _val47; // optional
                   _key46 = iprot.readString();
                   _val47 = iprot.readString();
                   struct.properties.put(_key46, _val47);
@@ -729,7 +729,7 @@ import org.slf4j.LoggerFactory;
           for (int _i51 = 0; _i51 < _map50.size; ++_i51)
           {
             String _key52; // required
-            String _val53; // required
+            String _val53; // optional
             _key52 = iprot.readString();
             _val53 = iprot.readString();
             struct.properties.put(_key52, _val53);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
(original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
Wed Jul 18 19:00:12 2012
@@ -3510,7 +3510,7 @@ import org.slf4j.LoggerFactory;
                   for (int _i77 = 0; _i77 < _map76.size; ++_i77)
                   {
                     String _key78; // required
-                    Map<String,String> _val79; // required
+                    Map<String,String> _val79; // optional
                     _key78 = iprot.readString();
                     {
                       org.apache.thrift.protocol.TMap _map80 = iprot.readMapBegin();
@@ -3518,7 +3518,7 @@ import org.slf4j.LoggerFactory;
                       for (int _i81 = 0; _i81 < _map80.size; ++_i81)
                       {
                         String _key82; // required
-                        String _val83; // required
+                        String _val83; // optional
                         _key82 = iprot.readString();
                         _val83 = iprot.readString();
                         _val79.put(_key82, _val83);
@@ -3851,7 +3851,7 @@ import org.slf4j.LoggerFactory;
             for (int _i104 = 0; _i104 < _map103.size; ++_i104)
             {
               String _key105; // required
-              Map<String,String> _val106; // required
+              Map<String,String> _val106; // optional
               _key105 = iprot.readString();
               {
                 org.apache.thrift.protocol.TMap _map107 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
@@ -3859,7 +3859,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i108 = 0; _i108 < _map107.size; ++_i108)
                 {
                   String _key109; // required
-                  String _val110; // required
+                  String _val110; // optional
                   _key109 = iprot.readString();
                   _val110 = iprot.readString();
                   _val106.put(_key109, _val110);
@@ -7088,7 +7088,7 @@ import org.slf4j.LoggerFactory;
                   for (int _i115 = 0; _i115 < _map114.size; ++_i115)
                   {
                     org.apache.accumulo.core.data.thrift.TKeyExtent _key116; // required
-                    List<org.apache.accumulo.core.data.thrift.TRange> _val117; // required
+                    List<org.apache.accumulo.core.data.thrift.TRange> _val117; // optional
                     _key116 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
                     _key116.read(iprot);
                     {
@@ -7158,7 +7158,7 @@ import org.slf4j.LoggerFactory;
                   for (int _i128 = 0; _i128 < _map127.size; ++_i128)
                   {
                     String _key129; // required
-                    Map<String,String> _val130; // required
+                    Map<String,String> _val130; // optional
                     _key129 = iprot.readString();
                     {
                       org.apache.thrift.protocol.TMap _map131 = iprot.readMapBegin();
@@ -7166,7 +7166,7 @@ import org.slf4j.LoggerFactory;
                       for (int _i132 = 0; _i132 < _map131.size; ++_i132)
                       {
                         String _key133; // required
-                        String _val134; // required
+                        String _val134; // optional
                         _key133 = iprot.readString();
                         _val134 = iprot.readString();
                         _val130.put(_key133, _val134);
@@ -7448,7 +7448,7 @@ import org.slf4j.LoggerFactory;
             for (int _i153 = 0; _i153 < _map152.size; ++_i153)
             {
               org.apache.accumulo.core.data.thrift.TKeyExtent _key154; // required
-              List<org.apache.accumulo.core.data.thrift.TRange> _val155; // required
+              List<org.apache.accumulo.core.data.thrift.TRange> _val155; // optional
               _key154 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
               _key154.read(iprot);
               {
@@ -7502,7 +7502,7 @@ import org.slf4j.LoggerFactory;
             for (int _i166 = 0; _i166 < _map165.size; ++_i166)
             {
               String _key167; // required
-              Map<String,String> _val168; // required
+              Map<String,String> _val168; // optional
               _key167 = iprot.readString();
               {
                 org.apache.thrift.protocol.TMap _map169 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
@@ -7510,7 +7510,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i170 = 0; _i170 < _map169.size; ++_i170)
                 {
                   String _key171; // required
-                  String _val172; // required
+                  String _val172; // optional
                   _key171 = iprot.readString();
                   _val172 = iprot.readString();
                   _val168.put(_key171, _val172);
@@ -10514,6 +10514,8 @@ import org.slf4j.LoggerFactory;
 
     private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException
{
       try {
+        // it doesn't seem like you should have to do this, but java serialization is wacky,
and doesn't call the default constructor.
+        __isset_bit_vector = new BitSet(1);
         read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
       } catch (org.apache.thrift.TException te) {
         throw new java.io.IOException(te);
@@ -14105,7 +14107,7 @@ import org.slf4j.LoggerFactory;
                   for (int _i185 = 0; _i185 < _map184.size; ++_i185)
                   {
                     org.apache.accumulo.core.data.thrift.TKeyExtent _key186; // required
-                    Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo> _val187;
// required
+                    Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo> _val187;
// optional
                     _key186 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
                     _key186.read(iprot);
                     {
@@ -14114,7 +14116,7 @@ import org.slf4j.LoggerFactory;
                       for (int _i189 = 0; _i189 < _map188.size; ++_i189)
                       {
                         String _key190; // required
-                        org.apache.accumulo.core.data.thrift.MapFileInfo _val191; // required
+                        org.apache.accumulo.core.data.thrift.MapFileInfo _val191; // optional
                         _key190 = iprot.readString();
                         _val191 = new org.apache.accumulo.core.data.thrift.MapFileInfo();
                         _val191.read(iprot);
@@ -14281,7 +14283,7 @@ import org.slf4j.LoggerFactory;
             for (int _i197 = 0; _i197 < _map196.size; ++_i197)
             {
               org.apache.accumulo.core.data.thrift.TKeyExtent _key198; // required
-              Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo> _val199;
// required
+              Map<String,org.apache.accumulo.core.data.thrift.MapFileInfo> _val199;
// optional
               _key198 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
               _key198.read(iprot);
               {
@@ -14290,7 +14292,7 @@ import org.slf4j.LoggerFactory;
                 for (int _i201 = 0; _i201 < _map200.size; ++_i201)
                 {
                   String _key202; // required
-                  org.apache.accumulo.core.data.thrift.MapFileInfo _val203; // required
+                  org.apache.accumulo.core.data.thrift.MapFileInfo _val203; // optional
                   _key202 = iprot.readString();
                   _val203 = new org.apache.accumulo.core.data.thrift.MapFileInfo();
                   _val203.read(iprot);

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1363046&r1=1363045&r2=1363046&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Wed Jul
18 19:00:12 2012
@@ -268,7 +268,7 @@ public class Shell extends ShellOptions 
       this.setTableName("");
       connector = instance.getConnector(user, pass);
       this.credentials = new AuthInfo(user, ByteBuffer.wrap(pass), connector.getInstance().getInstanceID());
-      updateUser(credentials);
+      
     } catch (Exception e) {
       printException(e);
       configError = true;
@@ -911,8 +911,6 @@ public class Shell extends ShellOptions 
   public void updateUser(AuthInfo authInfo) throws AccumuloException, AccumuloSecurityException
{
     connector = instance.getConnector(authInfo);
     credentials = authInfo;
-    if (!connector.securityOperations().authenticateUser(authInfo.user, authInfo.getPassword()))
-      throw new RuntimeException("Unable to authenticate user " + authInfo.user);
   }
   
   public AuthInfo getCredentials() {



Mime
View raw message