Skip to content

Commit 8836282

Browse files
committed
[Java] Fix up issues and discoveries found from PR aeron-io#319.
1 parent 6d7b133 commit 8836282

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
lines changed

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStub.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class ExampleUsingGeneratedStub
4747
MANUFACTURER_CODE = "123".getBytes(EngineEncoder.manufacturerCodeCharacterEncoding());
4848
MAKE = "Honda".getBytes(CarEncoder.makeCharacterEncoding());
4949
MODEL = "Civic VTi".getBytes(CarEncoder.modelCharacterEncoding());
50-
ACTIVATION_CODE = new UnsafeBuffer(ByteBuffer.wrap(new byte[]{'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f'}));
50+
ACTIVATION_CODE = new UnsafeBuffer("abcdef".getBytes(CarEncoder.activationCodeCharacterEncoding()));
5151
}
5252
catch (final UnsupportedEncodingException ex)
5353
{
@@ -240,7 +240,8 @@ public static void decode(
240240

241241
final UnsafeBuffer tempBuffer = new UnsafeBuffer(buffer);
242242
final int tempBufferLength = car.getActivationCode(tempBuffer, 0, tempBuffer.capacity());
243-
sb.append("\ncar.activationCode=").append(new String(buffer, 0, tempBufferLength, Charset.forName("UTF-8")));
243+
sb.append("\ncar.activationCode=").append(
244+
new String(buffer, 0, tempBufferLength, CarEncoder.activationCodeCharacterEncoding()));
244245

245246
sb.append("\ncar.encodedLength=").append(car.encodedLength());
246247

sbe-samples/src/main/java/uk/co/real_logic/sbe/examples/ExampleUsingGeneratedStubExtension.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import java.io.UnsupportedEncodingException;
2323
import java.nio.ByteBuffer;
2424
import java.nio.channels.FileChannel;
25-
import java.nio.charset.Charset;
2625

2726
import static extension.CarEncoder.cupHolderCountNullValue;
2827

@@ -38,9 +37,6 @@ public class ExampleUsingGeneratedStubExtension
3837
private static final baseline.MessageHeaderDecoder MESSAGE_HEADER_DECODER = new baseline.MessageHeaderDecoder();
3938
private static final baseline.MessageHeaderEncoder MESSAGE_HEADER_ENCODER = new baseline.MessageHeaderEncoder();
4039
private static final baseline.CarEncoder CAR_ENCODER_0 = new baseline.CarEncoder();
41-
private static final extension.CarEncoder CAR_ENCODER_1 = new extension.CarEncoder();
42-
43-
private static final baseline.CarDecoder CAR_DECODER_0 = new baseline.CarDecoder();
4440
private static final extension.CarDecoder CAR_DECODER_1 = new extension.CarDecoder();
4541

4642
static
@@ -51,7 +47,7 @@ public class ExampleUsingGeneratedStubExtension
5147
MANUFACTURER_CODE = "123".getBytes(baseline.EngineEncoder.manufacturerCodeCharacterEncoding());
5248
MAKE = "Honda".getBytes(baseline.CarEncoder.makeCharacterEncoding());
5349
MODEL = "Civic VTi".getBytes(baseline.CarEncoder.modelCharacterEncoding());
54-
ACTIVATION_CODE = new UnsafeBuffer(ByteBuffer.wrap(new byte[]{'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f'}));
50+
ACTIVATION_CODE = new UnsafeBuffer("abcdef".getBytes(baseline.CarEncoder.activationCodeCharacterEncoding()));
5551
}
5652
catch (final UnsupportedEncodingException ex)
5753
{
@@ -248,7 +244,8 @@ public static void decode(
248244

249245
final UnsafeBuffer tempBuffer = new UnsafeBuffer(buffer);
250246
final int tempBufferLength = car.getActivationCode(tempBuffer, 0, tempBuffer.capacity());
251-
sb.append("\ncar.activationCode=").append(new String(buffer, 0, tempBufferLength, Charset.forName("UTF-8")));
247+
sb.append("\ncar.activationCode=").append(
248+
new String(buffer, 0, tempBufferLength, extension.CarEncoder.activationCodeCharacterEncoding()));
252249

253250
sb.append("\ncar.encodedLength=").append(car.encodedLength());
254251

sbe-tool/src/main/java/uk/co/real_logic/sbe/PrimitiveValue.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.io.UnsupportedEncodingException;
1919
import java.math.BigInteger;
20-
import java.nio.charset.Charset;
2120
import java.util.Arrays;
2221

2322
import static java.lang.Double.doubleToLongBits;
@@ -155,7 +154,7 @@ public static PrimitiveValue parse(final String value, final PrimitiveType primi
155154
{
156155
throw new IllegalArgumentException("Constant char value malformed: " + value);
157156
}
158-
return new PrimitiveValue((long)value.getBytes(Charset.forName("UTF-8"))[0], 1);
157+
return new PrimitiveValue((long)value.getBytes(forName("US-ASCII"))[0], 1);
159158

160159
case INT8:
161160
return new PrimitiveValue(Byte.parseByte(value), 1);

0 commit comments

Comments
 (0)