From f12ce83a250bd80a93f66a4b1e63378b85a7bf9d Mon Sep 17 00:00:00 2001 From: Erik Gahlin Date: Fri, 28 Nov 2014 16:56:45 +0100 Subject: [PATCH] 6618335: ThreadReference.stop(null) throws NPE instead of InvalidTypeException Reviewed-by: sla --- .../share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java index 903477118a9..34abb5f5137 100644 --- a/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java +++ b/jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi/ThreadReferenceImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -238,7 +238,7 @@ public class ThreadReferenceImpl extends ObjectReferenceImpl } public void stop(ObjectReference throwable) throws InvalidTypeException { - validateMirror(throwable); + validateMirrorOrNull(throwable); // Verify that the given object is a Throwable instance List list = vm.classesByName("java.lang.Throwable"); ClassTypeImpl throwableClass = (ClassTypeImpl)list.get(0);