OpenJDK / jdk / hs
changeset 46897:3aa0378f0490
Merge
| author | jwilhelm |
|---|---|
| date | Tue, 22 Aug 2017 16:20:29 +0200 |
| parents | 16e7cacc7896 161d696f4ff4 |
| children | 4d2a6afafb76 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java Tue Aug 22 09:41:58 2017 -0400 +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachNotSupportedException.java Tue Aug 22 16:20:29 2017 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 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 @@ -29,7 +29,7 @@ /** * Thrown by {@link com.sun.tools.attach.VirtualMachine#attach - * VirtalMachine.attach} when attempting to attach to a Java virtual machine + * VirtualMachine.attach} when attempting to attach to a Java virtual machine * for which a compatible {@link com.sun.tools.attach.spi.AttachProvider * AttachProvider} does not exist. It is also thrown by {@link * com.sun.tools.attach.spi.AttachProvider#attachVirtualMachine
--- a/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java Tue Aug 22 09:41:58 2017 -0400 +++ b/jdk/src/jdk.attach/share/classes/com/sun/tools/attach/AttachPermission.java Tue Aug 22 16:20:29 2017 +0200 @@ -28,7 +28,7 @@ /** * When a {@link java.lang.SecurityManager SecurityManager} set, this * is the permission which will be checked when code invokes {@link - * VirtualMachine#attach VirtalMachine.attach} to attach to a target virtual + * VirtualMachine#attach VirtualMachine.attach} to attach to a target virtual * machine. * This permission is also checked when an {@link * com.sun.tools.attach.spi.AttachProvider AttachProvider} is created.