Skip to content

Fix #131 De/serialization of ConcurrentHashMap fails #264

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pzygielo merged 1 commit into from
Jan 22, 2026
Merged

Fix #131 De/serialization of ConcurrentHashMap fails #264

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions orbmain/src/main/java/com/sun/corba/ee/impl/io/IIOPInputStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*
* Copyright (c) 2026 Contributors to the Eclipse Foundation.
* Copyright (c) 1997, 2020 Oracle and/or its affiliates.
* Copyright (c) 1998-1999 IBM Corp. All rights reserved.
*
Expand Down Expand Up @@ -1826,43 +1827,59 @@ private void inputPrimitiveField(Object o, Class<?> cl,
switch (field.getTypeCode()) {
case 'B':
byte byteValue = orbStream.read_octet();
bridge.putByte( o, field.getFieldID(), byteValue ) ;
//reflective code: field.getField().setByte( o, byteValue ) ;
if (field.getField() != null) {
bridge.putByte(o, field.getFieldID(), byteValue);
//reflective code: field.getField().setByte( o, byteValue ) ;
}
break;
case 'Z':
boolean booleanValue = orbStream.read_boolean();
bridge.putBoolean( o, field.getFieldID(), booleanValue ) ;
//reflective code: field.getField().setBoolean( o, booleanValue ) ;
if (field.getField() != null) {
bridge.putBoolean(o, field.getFieldID(), booleanValue);
//reflective code: field.getField().setBoolean( o, booleanValue ) ;
}
break;
case 'C':
char charValue = orbStream.read_wchar();
bridge.putChar( o, field.getFieldID(), charValue ) ;
//reflective code: field.getField().setChar( o, charValue ) ;
if (field.getField() != null) {
bridge.putChar(o, field.getFieldID(), charValue);
//reflective code: field.getField().setChar( o, charValue ) ;
}
break;
case 'S':
short shortValue = orbStream.read_short();
bridge.putShort( o, field.getFieldID(), shortValue ) ;
//reflective code: field.getField().setShort( o, shortValue ) ;
if (field.getField() != null) {
bridge.putShort(o, field.getFieldID(), shortValue);
//reflective code: field.getField().setShort( o, shortValue ) ;
}
break;
case 'I':
int intValue = orbStream.read_long();
bridge.putInt( o, field.getFieldID(), intValue ) ;
//reflective code: field.getField().setInt( o, intValue ) ;
if (field.getField() != null) {
bridge.putInt(o, field.getFieldID(), intValue);
//reflective code: field.getField().setInt( o, intValue ) ;
}
break;
case 'J':
long longValue = orbStream.read_longlong();
bridge.putLong( o, field.getFieldID(), longValue ) ;
//reflective code: field.getField().setLong( o, longValue ) ;
if (field.getField() != null) {
bridge.putLong(o, field.getFieldID(), longValue);
//reflective code: field.getField().setLong( o, longValue ) ;
}
break;
case 'F' :
float floatValue = orbStream.read_float();
bridge.putFloat( o, field.getFieldID(), floatValue ) ;
//reflective code: field.getField().setFloat( o, floatValue ) ;
if (field.getField() != null) {
bridge.putFloat(o, field.getFieldID(), floatValue);
//reflective code: field.getField().setFloat( o, floatValue ) ;
}
break;
case 'D' :
double doubleValue = orbStream.read_double();
bridge.putDouble( o, field.getFieldID(), doubleValue ) ;
//reflective code: field.getField().setDouble( o, doubleValue ) ;
if (field.getField() != null) {
bridge.putDouble(o, field.getFieldID(), doubleValue);
//reflective code: field.getField().setDouble( o, doubleValue ) ;
}
break;
default:
throw Exceptions.self.invalidClassForPrimitive(
Expand Down Expand Up @@ -2308,10 +2325,6 @@ private void inputClassFields(Object o, Class<?> cl,
if (o != null) {
for (int i = 0; i < primFields; ++i) {
OperationTracer.readingField( fields[i].getName() ) ;
if (fields[i].getField() == null) {
continue;
}

inputPrimitiveField(o, cl, fields[i]);
}
}
Expand Down