stewi2
diff --git a/‎dependency-reduced-pom.xml‎
Lines changed: 0 additions & 39 deletions b/‎dependency-reduced-pom.xml‎
Lines changed: 0 additions & 39 deletions
diff --git a/‎src/main/java/com/basho/riak/client/api/commands/kv/UpdateValue.java‎
Lines changed: 26 additions & 5 deletions b/‎src/main/java/com/basho/riak/client/api/commands/kv/UpdateValue.java‎
Lines changed: 26 additions & 5 deletions
@@ -249,45 +249,6 @@
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>shaded_pb</id>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>2.1</version>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>shade</goal>
-                </goals>
-                <configuration>
-                  <shadedArtifactAttached>true</shadedArtifactAttached>
-                  <createDependencyReducedPom>true</createDependencyReducedPom>
-                  <artifactSet>
-                    <includes>
-                      <include>com.google.protobuf:protobuf-java</include>
-                      <include>com.basho.riak.protobuf:riak-pb</include>
-                    </includes>
-                  </artifactSet>
-                  <relocations>
-                    <relocation>
-                      <pattern>com.google.protobuf</pattern>
-                      <shadedPattern>shaded.com.google.protobuf</shadedPattern>
-                    </relocation>
-                    <relocation>
-                      <pattern>com.basho.riak.protobuf</pattern>
-                      <shadedPattern>shaded.com.bash.riak.protobuf</shadedPattern>
-                    </relocation>
-                  </relocations>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
   <dependencies>
     <dependency>
 
@@ -35,6 +35,7 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 /**
  * Perform an full cycle update of a Riak value: fetch, resolve, modify, store.
@@ -468,17 +469,37 @@ public boolean cancel(boolean mayInterruptIfRunning)
         }
 
         @Override
-        public Response get() throws InterruptedException
+        public Response get() throws InterruptedException, ExecutionException
         {
             latch.await();
-            return updateResponse;
+            
+            if (exception != null)
+            {
+                throw new ExecutionException(exception);
+            }
+            else 
+            {
+                return updateResponse;
+            }
         }
 
         @Override
-        public Response get(long timeout, TimeUnit unit) throws InterruptedException
+        public Response get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
         {
-            latch.await(timeout, unit);
-            return updateResponse;
+            boolean succeed = latch.await(timeout, unit);
+            
+            if (!succeed)
+            {
+                throw new TimeoutException();
+            }
+            else if (exception != null)
+            {
+                throw new ExecutionException(exception);
+            }
+            else 
+            {
+                return updateResponse;
+            }
         }
 
         @Override