stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8129499: Structure of java/rmi/activation/rmidViaInheritedChannel tests masks exception

Browse Source 
Check for rmid == null before dereferencing the variable.

Reviewed-by: rriggs, chegar
This commit is contained in:
Brian Burkhalter 2015-06-22 13:30:21 -07:00
parent c1108923f4
commit c0b2c2b0e6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2015, 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
@ -126,9 +126,11 @@ public class InheritedChannelNotServerSocket {
if (obj != null) { if (obj != null) {
UnicastRemoteObject.unexportObject(obj, true); UnicastRemoteObject.unexportObject(obj, true);
} }
if (rmid != null) {
rmid.cleanup(); rmid.cleanup();
} }
} }
}
public static class SP extends SelectorProvider { public static class SP extends SelectorProvider {
private final SelectorProvider provider; private final SelectorProvider provider;

4
jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2015, 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
@ -125,9 +125,11 @@ public class RmidViaInheritedChannel implements Callback {
if (obj != null) { if (obj != null) {
UnicastRemoteObject.unexportObject(obj, true); UnicastRemoteObject.unexportObject(obj, true);
} }
if (rmid != null) {
rmid.cleanup(); rmid.cleanup();
} }
} }
}
public static class RmidSelectorProvider extends SelectorProvider { public static class RmidSelectorProvider extends SelectorProvider {