8232622: Technical debt in BadAttributeValueExpException

Reviewed-by: dfuchs, sspitsyn
This commit is contained in:
Roger Riggs 2020-02-20 10:03:05 -05:00
parent b4ffe4d8f7
commit 2d93a28447

View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1999, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -48,7 +48,7 @@ public class BadAttributeValueExpException extends Exception {
* for example, the string value can be the return of {@code attribute.toString()} * for example, the string value can be the return of {@code attribute.toString()}
*/ */
@SuppressWarnings("serial") // See handling in constructor and readObject @SuppressWarnings("serial") // See handling in constructor and readObject
private Object val; private String val;
/** /**
* Constructs a BadAttributeValueExpException using the specified Object to * Constructs a BadAttributeValueExpException using the specified Object to
@ -72,19 +72,8 @@ public class BadAttributeValueExpException extends Exception {
ObjectInputStream.GetField gf = ois.readFields(); ObjectInputStream.GetField gf = ois.readFields();
Object valObj = gf.get("val", null); Object valObj = gf.get("val", null);
if (valObj == null) { if (valObj instanceof String || valObj == null) {
val = null; val = (String)valObj;
} else if (valObj instanceof String) {
val= valObj;
} else if (System.getSecurityManager() == null
|| valObj instanceof Long
|| valObj instanceof Integer
|| valObj instanceof Float
|| valObj instanceof Double
|| valObj instanceof Byte
|| valObj instanceof Short
|| valObj instanceof Boolean) {
val = valObj.toString();
} else { // the serialized object is from a version without JDK-8019292 fix } else { // the serialized object is from a version without JDK-8019292 fix
val = System.identityHashCode(valObj) + "@" + valObj.getClass().getName(); val = System.identityHashCode(valObj) + "@" + valObj.getClass().getName();
} }