Merge pull request #64 from RADAR-base/release-0.11.3

Release 0.11.3
RADAR-base · Nov 13, 2018 · a9a26df · a9a26df
2 parents 99dc7f4 + 94f2558
commit a9a26df
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
- implementation group: 'org.radarcns', name: 'radar-commons', version: '0.11.2'
+ implementation group: 'org.radarcns', name: 'radar-commons', version: '0.11.3'
 }
 ```
 
@@ -26,7 +26,7 @@ repositories {
 }
 
 dependencies {
- implementation group: 'org.radarcns', name: 'radar-commons-server', version: '0.11.2'
+ implementation group: 'org.radarcns', name: 'radar-commons-server', version: '0.11.3'
 }
 ```
 
@@ -40,7 +40,7 @@ repositories {
 }
 
 dependencies {
- testImplementation group: 'org.radarcns', name: 'radar-commons-testing', version: '0.11.2'
+ testImplementation group: 'org.radarcns', name: 'radar-commons-testing', version: '0.11.3'
 }
 ```
 
@@ -53,7 +53,7 @@ repositories {
 }
 
 dependencies {
- runtimeOnly group: 'org.radarcns', name: 'radar-commons-unsafe', version: '0.11.2'
+ runtimeOnly group: 'org.radarcns', name: 'radar-commons-unsafe', version: '0.11.3'
 }
 ```
 
@@ -78,7 +78,7 @@ configurations.all {
 }
 
 dependencies {
- compile group: 'org.radarcns', name: 'radar-commons', version: '0.11.3-SNAPSHOT', changing: true
+ compile group: 'org.radarcns', name: 'radar-commons', version: '0.11.4-SNAPSHOT', changing: true
 }
 ```
 

diff --git a/build.gradle b/build.gradle
@@ -36,7 +36,7 @@ subprojects {
  // Configuration //
  //---------------------------------------------------------------------------//
 
- version = '0.11.2'
+ version = '0.11.3'
  group = 'org.radarcns'
  ext.githubRepoName = 'RADAR-CNS/RADAR-Commons'
 

diff --git a/radar-commons/src/main/java/org/radarcns/data/RemoteSchemaEncoder.java b/radar-commons/src/main/java/org/radarcns/data/RemoteSchemaEncoder.java
@@ -63,7 +63,6 @@ public final void setReaderSchema(ParsedSchemaMetadata readerSchema)
  && readerSchema.getSchema().equals(this.serverSchema.getSchema())) {
  return;
  }
- this.serverSchema = readerSchema;
  try {
  if (!isGeneric) {
  this.mapper = AvroDataMapperFactory.IDENTITY_MAPPER;
@@ -74,6 +73,7 @@ public final void setReaderSchema(ParsedSchemaMetadata readerSchema)
  null);
  encoder = recordEncoder.writer(readerSchema.getSchema(), Object.class);
  }
+ this.serverSchema = readerSchema;
  } catch (IOException ex) {
  throw new IllegalStateException("Cannot construct Avro writer", ex);
  }

diff --git a/radar-commons/src/main/java/org/radarcns/producer/rest/BinaryRecordRequest.java b/radar-commons/src/main/java/org/radarcns/producer/rest/BinaryRecordRequest.java
@@ -127,6 +127,6 @@ public void prepare(ParsedSchemaMetadata keySchema, ParsedSchemaMetadata valueSc
  public String content(int maxLength) throws IOException {
  Buffer buffer = new Buffer();
  writeToSink(buffer, maxLength / 2 - 2);
- return "0x" + bytesToHex(buffer.readByteArray(maxLength - 2));
+ return "0x" + bytesToHex(buffer.readByteArray(Math.min(buffer.size(), maxLength - 2)));
  }
 }
diff --git a/radar-commons/src/main/java/org/radarcns/producer/rest/JsonRecordRequest.java b/radar-commons/src/main/java/org/radarcns/producer/rest/JsonRecordRequest.java
@@ -121,6 +121,6 @@ public void prepare(ParsedSchemaMetadata keySchema, ParsedSchemaMetadata valueSc
  public String content(int maxLength) throws IOException {
  Buffer buffer = new Buffer();
  writeToSink(buffer, maxLength);
- return buffer.readString(maxLength, StandardCharsets.UTF_8);
+ return buffer.readString(Math.min(buffer.size(), maxLength), StandardCharsets.UTF_8);
  }
 }