From b1ccabf65df39e4ab553f6c4734942b9f89992b1 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Mon, 10 Dec 2012 17:18:32 +0000 Subject: Decommissioning java 1.5 (EOLed since October 2009): removal of the different 1.5 jre and jdk vendors Removing outdated jdk16 vendors: removing all the bsdjava and freebsd vendors, consider using openjdk6 or openjsk7 instead. Discussed with: java (glarkin) --- .../files/patch-j2se-attach-BSDAttachProvider.java | 44 ---------------------- 1 file changed, 44 deletions(-) delete mode 100644 java/jdk16/files/patch-j2se-attach-BSDAttachProvider.java (limited to 'java/jdk16/files/patch-j2se-attach-BSDAttachProvider.java') diff --git a/java/jdk16/files/patch-j2se-attach-BSDAttachProvider.java b/java/jdk16/files/patch-j2se-attach-BSDAttachProvider.java deleted file mode 100644 index fa3c3e31c0af..000000000000 --- a/java/jdk16/files/patch-j2se-attach-BSDAttachProvider.java +++ /dev/null @@ -1,44 +0,0 @@ -$FreeBSD$ - ---- ../../j2se/src/solaris/classes/sun/tools/attach/BSDAttachProvider.java 10 May 2007 05:38:51 -0000 1.1 -+++ ../../j2se/src/solaris/classes/sun/tools/attach/BSDAttachProvider.java 2 Feb 2009 00:27:30 -0000 -@@ -14,7 +14,7 @@ - import java.io.IOException; - - /* -- * An AttachProvider implementation for Linux that uses a UNIX domain -+ * An AttachProvider implementation for BSD that uses a UNIX domain - * socket. - */ - public class BSDAttachProvider extends HotSpotAttachProvider { -@@ -36,12 +36,28 @@ - public VirtualMachine attachVirtualMachine(String vmid) - throws AttachNotSupportedException, IOException - { -- throw new AttachNotSupportedException("Attach not yet supported on BSD"); -+ if (isNotAttachable(vmid)) { -+ throw new AttachNotSupportedException("can only attach to Java SE 6.0 or newer"); -+ } -+ return new BSDVirtualMachine(this, vmid); - } - - public VirtualMachine attachVirtualMachine(VirtualMachineDescriptor vmd) - throws AttachNotSupportedException, IOException - { -- throw new AttachNotSupportedException("Attach not yet supported on BSD"); -+ if (vmd.provider() != this) { -+ throw new AttachNotSupportedException("provider mismatch"); -+ } -+ // To avoid re-checking if the VM if attachable, we check if the descriptor -+ // is for a hotspot VM - these descriptors are created by the listVirtualMachines -+ // implementation which only returns a list of attachable VMs. -+ if (vmd instanceof HotSpotVirtualMachineDescriptor) { -+ assert ((HotSpotVirtualMachineDescriptor)vmd).isAttachable(); -+ checkAttachPermission(); -+ return new BSDVirtualMachine(this, vmd.id()); -+ } else { -+ return attachVirtualMachine(vmd.id()); -+ } - } -+ - } -- cgit v1.2.3