Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: voldemort/voldemort
base: master
...
head fork: voldemort/voldemort
compare: li-r1008
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
2  build.properties
View
@@ -33,4 +33,4 @@ tomcat.manager.password=tomcat
tomcat.context=/voldemort
## Release
-curr.release=0.70.1
+curr.release=0.70.3
4 src/java/voldemort/serialization/VoldemortOpCode.java
View
@@ -27,6 +27,6 @@
public static final byte DELETE_PARTITIONS_OP_CODE = 7;
public static final byte UPDATE_METADATA_OP_CODE = 8;
public static final byte REDIRECT_GET_OP_CODE = 9;
- public static final byte GET_METADATA_OP_CODE = 10;
- public static final byte GET_VERSION_OP_CODE = 11;
+ public static final byte GET_VERSION_OP_CODE = 10;
+ public static final byte GET_METADATA_OP_CODE = 11;
}
2  src/java/voldemort/server/protocol/vold/VoldemortNativeRequestHandler.java
View
@@ -88,7 +88,7 @@ private RequestRoutingType getRoutingType(DataInputStream inputStream) throws IO
routingType = RequestRoutingType.getRequestRoutingType(isRouted, false);
}
- else if(protocolVersion > 1) {
+ if(protocolVersion > 1) {
int routingTypeCode = inputStream.readByte();
routingType = RequestRoutingType.getRequestRoutingType(routingTypeCode);
}
14 src/java/voldemort/utils/pool/KeyedResourcePool.java
View
@@ -228,19 +228,7 @@ public void close() {
}
}
- public void close(K key) {
- Pool<V> pool = resourcesMap.get(key);
-
- if(pool == null)
- throw new IllegalArgumentException("Invalid key '" + key
- + "': no resource pool exists for that key.");
-
- // destroy each resource in the queue
- for(V value = pool.nonBlockingGet(); value != null; value = pool.nonBlockingGet())
- destroyResource(key, pool, value);
-
- resourcesMap.remove(key);
- }
+ public void close(K key) { }
/**
* Return the total number of resources for the given key whether they are

No commit comments for this range

Something went wrong with that request. Please try again.