# HG changeset patch # User jwilhelm # Date 1504019877 -7200 # Node ID e28c8b19ffb2ba66a0b7c94cb32add84eff0826f # Parent 49f2da5b2ea3539805b734fa0a5799e5e6c41b4f# Parent 1d2eb4f23b71f444f432efc52e5634ffe2518599 Merge diff -r 49f2da5b2ea3 -r e28c8b19ffb2 jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c --- a/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c Tue Aug 29 12:16:22 2017 +0530 +++ b/jdk/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c Tue Aug 29 17:17:57 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2017, 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 @@ -57,7 +57,7 @@ } (void)outStream_writeString(out, name); if (name != NULL) { - jvmtiDeallocate(name); + JNI_FUNC_PTR(env, ReleaseStringUTFChars)(env, namestr, name); } return JNI_TRUE; }