--- a/.hgtags Sun Jul 27 17:16:44 2008 -0700
+++ b/.hgtags Sat Aug 02 16:37:20 2008 -0700
@@ -4,3 +4,5 @@ 3e599d98875ddf919c8ea11cff9b3a99ba631a9b
3e599d98875ddf919c8ea11cff9b3a99ba631a9b jdk7-b27
02e4c5348592a8d7fc2cba28bc5f8e35c0e17277 jdk7-b28
e21f4266466cd1306b176aaa08b2cd8337a9be3d jdk7-b29
+b6d6877c1155621a175dccd12dc14c54f938fb8b jdk7-b30
+b7474b739d13bacd9972f88ac91f6350b7b0be12 jdk7-b31
--- a/make/com/sun/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/com/sun/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/make/common/Defs-linux.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/Defs-linux.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/make/common/Defs-solaris.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/Defs-solaris.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/make/common/Defs-windows.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/Defs-windows.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/make/common/Defs.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/Defs.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/make/common/Release.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/Release.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/make/common/Rules.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/Rules.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/make/common/internal/BinaryPlugs.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/internal/BinaryPlugs.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/make/common/internal/Defs-langtools.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/internal/Defs-langtools.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/make/common/shared/Compiler-gcc.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/shared/Compiler-gcc.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/make/common/shared/Compiler-msvc.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/shared/Compiler-msvc.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/make/common/shared/Compiler-sun.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/shared/Compiler-sun.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/make/common/shared/Defs-control.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/shared/Defs-control.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/make/common/shared/Defs-utils.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/shared/Defs-utils.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/make/common/shared/Platform.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/shared/Platform.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc. 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
@@ -72,7 +72,6 @@ PLATFORM_SHARED=done
# ISA_DIR solaris only: /sparcv9 or /amd64
# LIBARCH32 solaris only: sparc or i386
# LIBARCH64 solaris only: sparcv9 or amd64
-# REQUIRED_WINDOWS_NAME windows only: basic name of windows
# REQUIRED_WINDOWS_VERSION windows only: specific version of windows
# USING_CYGWIN windows only: true or false
# WINDOWS_NT_VERSION_STRING windows only: long version name
@@ -311,19 +310,11 @@ ifeq ($(PLATFORM), windows)
endif
endif
export ARCH_DATA_MODEL
- # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel
- ARCH=i586
- LIBARCH=i386
- # Value of Java os.arch property
- ARCHPROP=x86
- REQUIRED_WINDOWS_NAME=Windows Professional 2000
- REQUIRED_WINDOWS_VERSION=5 0 Service Pack 4
ifeq ($(ARCH_DATA_MODEL), 64)
# If the user wants to perform a cross compile build then they must
# - set ARCH_DATA_MODEL=64 and either
# + set ARCH to ia64 or amd64, or
- REQUIRED_WINDOWS_NAME=Windows Server 2003
- REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1
+ REQUIRED_WINDOWS_VERSION=Server 2003 Enterprise x64 Edition
ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)), AMD64)
ARCH=amd64
else
@@ -332,6 +323,14 @@ ifeq ($(PLATFORM), windows)
LIBARCH=$(ARCH)
# Value of Java os.arch property
ARCHPROP=$(LIBARCH)
+ else
+ REQUIRED_WINDOWS_VERSION=2000 or Unknown
+ #REQUIRED_WINDOWS_VERSION=XP Professional
+ # LIBARCH is used to preserve the jre/lib/i386 directory name for 32-bit intel
+ ARCH=i586
+ LIBARCH=i386
+ # Value of Java os.arch property
+ ARCHPROP=x86
endif
ARCH_FAMILY = $(ARCH)
# Where is unwanted output to be delivered?
--- a/make/common/shared/Sanity.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/common/shared/Sanity.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc. 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
@@ -82,15 +82,16 @@ endif
endif
ifeq ($(PLATFORM), windows)
- WINVER=$(JDK_TOPDIR)/make/tools/winver/bin/winver.exe
FREE_SPACE := $(shell $(DF) -kP $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
TEMP_FREE_SPACE := $(shell $(DF) -kP $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$4;}')
- WINDOWS_VERSION := $(shell \
- if [ -x $(WINVER) ]; then \
- $(WINVER) ; \
- else \
- $(ECHO) "Unknown Windows Version"; \
- fi)
+ # Localized systeminfo has localized labels, but not localized values.
+ _WINDOWS_VERSION := \
+ $(shell systeminfo 2> $(DEV_NULL) | grep 'Microsoft' | grep 'Windows' | \
+ cut -d':' -f2)
+ ifeq ($(_WINDOWS_VERSION),)
+ _WINDOWS_VERSION := Windows 2000 or Unknown (no systeminfo utility)
+ endif
+ WINDOWS_VERSION := $(strip $(_WINDOWS_VERSION))
DXSDK_VER := $(shell $(EGREP) DIRECTDRAW_VERSION $(DXSDK_INCLUDE_PATH)/ddraw.h 2>&1 | \
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
endif
@@ -264,9 +265,9 @@ ifndef OPENJDK
"" >> $(WARNING_FILE) ; \
fi
ifeq ($(PLATFORM), windows)
- @if [ "$(WINDOWS_VERSION)" != "$(REQUIRED_WINDOWS_VERSION)" ]; then \
- $(ECHO) "WARNING: $(YOU_ARE_USING) an unsupported version of $(REQUIRED_WINDOWS_NAME). \n" \
- " The supported version is $(REQUIRED_WINDOWS_NAME) $(REQUIRED_WINDOWS_VERSION). \n" \
+ @if [ "$(findstring $(REQUIRED_WINDOWS_VERSION),$(WINDOWS_VERSION))" = "" ]; then \
+ $(ECHO) "WARNING: $(YOU_ARE_USING) an unknown version of Windows. \n" \
+ " The required version is $(REQUIRED_WINDOWS_VERSION). \n" \
" $(YOU_ARE_USING) $(WINDOWS_VERSION) \n" \
"" >> $(WARNING_FILE) ; \
fi
--- a/make/docs/CORE_PKGS.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/docs/CORE_PKGS.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2001-2008 Sun Microsystems, Inc. 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
@@ -155,6 +155,7 @@ CORE_PKGS =
javax.lang.model.type \
javax.lang.model.util \
javax.management \
+ javax.management.event \
javax.management.loading \
javax.management.monitor \
javax.management.relation \
--- a/make/docs/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/docs/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/make/docs/NON_CORE_PKGS.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/docs/NON_CORE_PKGS.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2002-2008 Sun Microsystems, Inc. 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
--- a/make/java/awt/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/awt/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/make/java/java/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/java/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/make/java/java/genlocales.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/java/genlocales.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/make/java/java/localegen.sh Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/java/localegen.sh Sat Aug 02 16:37:20 2008 -0700
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/make/java/java/mapfile-vers Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/java/mapfile-vers Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/make/java/jli/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/jli/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/make/java/main/java/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/main/java/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/make/java/main/javaw/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/main/javaw/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/make/java/nio/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/nio/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2000-2008 Sun Microsystems, Inc. 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
@@ -166,8 +166,8 @@ include $(BUILDDIR)/common/Library.gmk
# Generate source files
#
-SPP = spp.sh
-SPP_CMD = $(SH) $(SPP)
+SPP_JARFILE = $(BUILDTOOLJARDIR)/spp.jar
+SPP_CMD = $(BOOT_JAVA_CMD) -jar $(SPP_JARFILE)
FILES_genout = $(FILES_gen:%.java=$(GENSRCDIR)/%.java)
@@ -183,7 +183,7 @@ SCH_GEN=$(SNIO_GEN)/ch
SCH_GEN=$(SNIO_GEN)/ch
SCS_GEN=$(SNIO_GEN)/cs
-sources: $(SPP) $(FILES_genout)
+sources: $(SPP_JARFILE) $(FILES_genout)
#
# Generated buffer classes
--- a/make/java/nio/genCharsetProvider.sh Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/nio/genCharsetProvider.sh Sat Aug 02 16:37:20 2008 -0700
@@ -1,7 +1,7 @@
#! /bin/sh
#
-# Copyright 2004-2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2004-2008 Sun Microsystems, Inc. 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
--- a/make/java/nio/genCoder.sh Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/nio/genCoder.sh Sat Aug 02 16:37:20 2008 -0700
@@ -53,8 +53,8 @@ if [ x$what = xdecoder ]; then
-Dcoding='decoding' \
-DOtherCoder='Encoder' \
-DreplTypeName='string' \
- -DdefaultRepl='"\\\\uFFFD"' \
- -DdefaultReplName='<tt>"\\\\uFFFD"<\/tt>' \
+ -DdefaultRepl='"\\uFFFD"' \
+ -DdefaultReplName='<tt>"\\uFFFD"<\/tt>' \
-DreplType='String' \
-DreplFQType='java.lang.String' \
-DreplLength='length()' \
@@ -84,7 +84,7 @@ elif [ x$what = xencoder ]; then
-DOtherCoder='Decoder' \
-DreplTypeName='byte array' \
-DdefaultRepl='new byte[] { (byte)'"'"\\?"'"' }' \
- -DdefaultReplName='<tt>{<\/tt>\\\ <tt>(byte)'"'"\\?"'"'<\/tt>\\\ <tt>}<\/tt>' \
+ -DdefaultReplName='<tt>{<\/tt>\ <tt>(byte)'"'"\\?"'"'<\/tt>\ <tt>}<\/tt>' \
-DreplType='byte[]' \
-DreplFQType='byte[]' \
-DreplLength='length' \
--- a/make/java/nio/genExceptions.sh Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/nio/genExceptions.sh Sat Aug 02 16:37:20 2008 -0700
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/make/java/sun_nio/FILES_java.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/java/sun_nio/FILES_java.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/make/javax/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/javax/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/make/javax/others/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/javax/others/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/make/jdk_generic_profile.sh Sun Jul 27 17:16:44 2008 -0700
+++ b/make/jdk_generic_profile.sh Sat Aug 02 16:37:20 2008 -0700
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/make/jprt.config Sun Jul 27 17:16:44 2008 -0700
+++ b/make/jprt.config Sat Aug 02 16:37:20 2008 -0700
@@ -1,7 +1,7 @@
#!echo "This is not a shell script"
#############################################################################
#
-# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2006-2008 Sun Microsystems, Inc. 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
--- a/make/sun/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/sun/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/make/sun/cmm/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/sun/cmm/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2006-2008 Sun Microsystems, Inc. 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
--- a/make/sun/font/FILES_c.gmk Sun Jul 27 17:16:44 2008 -0700
+++ b/make/sun/font/FILES_c.gmk Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/make/sun/font/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/sun/font/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/make/sun/jawt/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/sun/jawt/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/make/sun/splashscreen/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/sun/splashscreen/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/make/tools/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/tools/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 1998-2008 Sun Microsystems, Inc. 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
@@ -51,7 +51,7 @@ SUBDIRS = \
jdwpgen \
makeclasslist \
strip_properties \
- winver \
+ spp \
CharsetMapping
all build clean clobber::
--- a/make/tools/freetypecheck/Makefile Sun Jul 27 17:16:44 2008 -0700
+++ b/make/tools/freetypecheck/Makefile Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
#
-# Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+# Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/make/tools/freetypecheck/freetypecheck.c Sun Jul 27 17:16:44 2008 -0700
+++ b/make/tools/freetypecheck/freetypecheck.c Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/make/tools/src/build/tools/jdwpgen/CommandNode.java Sun Jul 27 17:16:44 2008 -0700
+++ b/make/tools/src/build/tools/jdwpgen/CommandNode.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java Sun Jul 27 17:16:44 2008 -0700
+++ b/make/tools/src/build/tools/jdwpgen/ConstantSetNode.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/make/tools/src/build/tools/jdwpgen/RepeatNode.java Sun Jul 27 17:16:44 2008 -0700
+++ b/make/tools/src/build/tools/jdwpgen/RepeatNode.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/back/ThreadReferenceImpl.c Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/back/ThreadReferenceImpl.c Sat Aug 02 16:37:20 2008 -0700
@@ -540,7 +540,6 @@ ownedMonitorsWithStackDepth(PacketInputS
jvmtiError error = JVMTI_ERROR_NONE;
jint count = 0;
- jint depth;
jvmtiMonitorStackDepthInfo *monitors=NULL;
error = JVMTI_FUNC_PTR(gdata->jvmti,GetOwnedMonitorStackDepthInfo)
--- a/src/share/back/transport.c Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/back/transport.c Sat Aug 02 16:37:20 2008 -0700
@@ -473,7 +473,7 @@ transport_startTransport(jboolean isServ
/*
* Record listener address in a system property
*/
- len = strlen(name) + strlen(retAddress) + 2; /* ':' and '\0' */
+ len = (int)strlen(name) + (int)strlen(retAddress) + 2; /* ':' and '\0' */
prop_value = (char*)jvmtiAllocate(len);
strcpy(prop_value, name);
strcat(prop_value, ":");
--- a/src/share/bin/java.h Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/bin/java.h Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/bin/main.c Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/bin/main.c Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/crypto/provider/PBKDF2KeyImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/imageio/plugins/gif/GIFWritableImageMetadata.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKColorChooserPanel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKFileChooserUI.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/GTKStyle.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/MotifGraphicsUtils.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/MotifInternalFrameTitlePane.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/motif/MotifLookAndFeel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/java/swing/plaf/windows/WindowsLookAndFeel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/interceptor/DefaultMBeanServerInterceptor.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
@@ -453,11 +453,12 @@ public class DefaultMBeanServerIntercept
final ResourceContext context =
unregisterFromRepository(resource, instance, name);
-
- if (instance instanceof MBeanRegistration)
- postDeregisterInvoke((MBeanRegistration) instance);
-
- context.done();
+ try {
+ if (instance instanceof MBeanRegistration)
+ postDeregisterInvoke(name,(MBeanRegistration) instance);
+ } finally {
+ context.done();
+ }
}
public ObjectInstance getObjectInstance(ObjectName name)
@@ -989,10 +990,12 @@ public class DefaultMBeanServerIntercept
registerFailed = false;
registered = true;
} finally {
- postRegister(mbean, registered, registerFailed);
- }
-
- context.done();
+ try {
+ postRegister(logicalName, mbean, registered, registerFailed);
+ } finally {
+ if (registered) context.done();
+ }
+ }
return new ObjectInstance(logicalName, classname);
}
@@ -1051,7 +1054,8 @@ public class DefaultMBeanServerIntercept
}
private static void postRegister(
- DynamicMBean mbean, boolean registrationDone, boolean registerFailed) {
+ ObjectName logicalName, DynamicMBean mbean,
+ boolean registrationDone, boolean registerFailed) {
if (registerFailed && mbean instanceof DynamicMBean2)
((DynamicMBean2) mbean).registerFailed();
@@ -1059,11 +1063,19 @@ public class DefaultMBeanServerIntercept
if (mbean instanceof MBeanRegistration)
((MBeanRegistration) mbean).postRegister(registrationDone);
} catch (RuntimeException e) {
+ MBEANSERVER_LOGGER.fine("While registering MBean ["+logicalName+
+ "]: " + "Exception thrown by postRegister: " +
+ "rethrowing <"+e+">, but keeping the MBean registered");
throw new RuntimeMBeanException(e,
- "RuntimeException thrown in postRegister method");
+ "RuntimeException thrown in postRegister method: "+
+ "rethrowing <"+e+">, but keeping the MBean registered");
} catch (Error er) {
+ MBEANSERVER_LOGGER.fine("While registering MBean ["+logicalName+
+ "]: " + "Error thrown by postRegister: " +
+ "rethrowing <"+er+">, but keeping the MBean registered");
throw new RuntimeErrorException(er,
- "Error thrown in postRegister method");
+ "Error thrown in postRegister method: "+
+ "rethrowing <"+er+">, but keeping the MBean registered");
}
}
@@ -1076,15 +1088,28 @@ public class DefaultMBeanServerIntercept
}
}
- private static void postDeregisterInvoke(MBeanRegistration moi) {
+ private static void postDeregisterInvoke(ObjectName mbean,
+ MBeanRegistration moi) {
try {
moi.postDeregister();
} catch (RuntimeException e) {
+ MBEANSERVER_LOGGER.fine("While unregistering MBean ["+mbean+
+ "]: " + "Exception thrown by postDeregister: " +
+ "rethrowing <"+e+">, although the MBean is succesfully " +
+ "unregistered");
throw new RuntimeMBeanException(e,
- "RuntimeException thrown in postDeregister method");
+ "RuntimeException thrown in postDeregister method: "+
+ "rethrowing <"+e+
+ ">, although the MBean is sucessfully unregistered");
} catch (Error er) {
+ MBEANSERVER_LOGGER.fine("While unregistering MBean ["+mbean+
+ "]: " + "Error thrown by postDeregister: " +
+ "rethrowing <"+er+">, although the MBean is succesfully " +
+ "unregistered");
throw new RuntimeErrorException(er,
- "Error thrown in postDeregister method");
+ "Error thrown in postDeregister method: "+
+ "rethrowing <"+er+
+ ">, although the MBean is sucessfully unregistered");
}
}
--- a/src/share/classes/com/sun/jmx/interceptor/package.html Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/interceptor/package.html Sat Aug 02 16:37:20 2008 -0700
@@ -29,5 +29,8 @@ have any questions.
</head>
<body bgcolor="white">
Provides specific classes to <B>Sun JMX Reference Implementation</B>.
+ <p><b>
+ This API is a Sun internal API and is subject to changes without notice.
+ </b></p>
</BODY>
</HTML>
--- a/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/ConvertingMethod.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/DefaultMXBeanMappingFactory.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/Introspector.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/MBeanAnalyzer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/MBeanInjector.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/MBeanInjector.java Sat Aug 02 16:37:20 2008 -0700
@@ -172,7 +172,7 @@ public class MBeanInjector {
* reference.
*
* So we accept a Field if it has a @Resource annotation and either
- * (a) its type is ObjectName or a subclass and its @Resource type is
+ * (a) its type is exactly ObjectName and its @Resource type is
* compatible with ObjectName (e.g. it is Object); or
* (b) its type is compatible with ObjectName and its @Resource type
* is exactly ObjectName. Fields that meet these criteria will not
--- a/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/MBeanInstantiator.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/MBeanIntrospector.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/MBeanSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
@@ -25,7 +25,6 @@
package com.sun.jmx.mbeanserver;
-import static com.sun.jmx.mbeanserver.Util.*;
import javax.management.Attribute;
import javax.management.AttributeList;
--- a/src/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/MXBeanIntrospector.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/MXBeanLookup.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/MXBeanProxy.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/MXBeanSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/NotificationMBeanSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/NotificationMBeanSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/PerInterface.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/PerInterface.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/Repository.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/Repository.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/StandardMBeanSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/mbeanserver/Util.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/mbeanserver/Util.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
@@ -26,6 +26,7 @@ package com.sun.jmx.mbeanserver;
package com.sun.jmx.mbeanserver;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
@@ -37,10 +38,13 @@ import java.util.Map;
import java.util.Map;
import java.util.Set;
import java.util.SortedMap;
+import java.util.SortedSet;
import java.util.TreeMap;
+import java.util.TreeSet;
import java.util.WeakHashMap;
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
+import javax.management.loading.ClassLoaderRepository;
public class Util {
static <K, V> Map<K, V> newMap() {
@@ -113,4 +117,125 @@ public class Util {
public static <T> T cast(Object x) {
return (T) x;
}
+
+ /**
+ * Computes a descriptor hashcode from its names and values.
+ * @param names the sorted array of descriptor names.
+ * @param values the array of descriptor values.
+ * @return a hash code value, as described in {@link #hashCode(Descriptor)}
+ */
+ public static int hashCode(String[] names, Object[] values) {
+ int hash = 0;
+ for (int i = 0; i < names.length; i++) {
+ Object v = values[i];
+ int h;
+ if (v == null) {
+ h = 0;
+ } else if (v instanceof Object[]) {
+ h = Arrays.deepHashCode((Object[]) v);
+ } else if (v.getClass().isArray()) {
+ h = Arrays.deepHashCode(new Object[]{v}) - 31;
+ // hashcode of a list containing just v is
+ // v.hashCode() + 31, see List.hashCode()
+ } else {
+ h = v.hashCode();
+ }
+ hash += names[i].toLowerCase().hashCode() ^ h;
+ }
+ return hash;
+ }
+
+ /**
+ * Filters a set of ObjectName according to a given pattern.
+ *
+ * @param pattern the pattern that the returned names must match.
+ * @param all the set of names to filter.
+ * @return a set of ObjectName from which non matching names
+ * have been removed.
+ */
+ public static Set<ObjectName> filterMatchingNames(ObjectName pattern,
+ Set<ObjectName> all) {
+ // If no pattern, just return all names
+ if (pattern == null
+ || all.isEmpty()
+ || ObjectName.WILDCARD.equals(pattern))
+ return all;
+
+ // If there's a pattern, do the matching.
+ final Set<ObjectName> res = equivalentEmptySet(all);
+ for (ObjectName n : all) if (pattern.apply(n)) res.add(n);
+ return res;
+ }
+
+ /**
+ * An abstract ClassLoaderRepository that contains a single class loader.
+ **/
+ private final static class SingleClassLoaderRepository
+ implements ClassLoaderRepository {
+ private final ClassLoader singleLoader;
+
+ SingleClassLoaderRepository(ClassLoader loader) {
+ this.singleLoader = loader;
+ }
+
+ ClassLoader getSingleClassLoader() {
+ return singleLoader;
+ }
+
+ private Class<?> loadClass(String className, ClassLoader loader)
+ throws ClassNotFoundException {
+ return Class.forName(className, false, loader);
+ }
+
+ public Class<?> loadClass(String className)
+ throws ClassNotFoundException {
+ return loadClass(className, getSingleClassLoader());
+ }
+
+ public Class<?> loadClassWithout(ClassLoader exclude,
+ String className) throws ClassNotFoundException {
+ final ClassLoader loader = getSingleClassLoader();
+ if (exclude != null && exclude.equals(loader))
+ throw new ClassNotFoundException(className);
+ return loadClass(className, loader);
+ }
+
+ public Class<?> loadClassBefore(ClassLoader stop, String className)
+ throws ClassNotFoundException {
+ return loadClassWithout(stop, className);
+ }
+ }
+
+ /**
+ * Returns a ClassLoaderRepository that contains a single class loader.
+ * @param loader the class loader contained in the returned repository.
+ * @return a ClassLoaderRepository that contains the single loader.
+ */
+ public static ClassLoaderRepository getSingleClassLoaderRepository(
+ final ClassLoader loader) {
+ return new SingleClassLoaderRepository(loader);
+ }
+
+ public static <T> Set<T> cloneSet(Set<T> set) {
+ if (set instanceof SortedSet) {
+ @SuppressWarnings("unchecked")
+ SortedSet<T> sset = (SortedSet<T>) set;
+ set = new TreeSet<T>(sset.comparator());
+ set.addAll(sset);
+ } else
+ set = new HashSet<T>(set);
+ return set;
+ }
+
+ public static <T> Set<T> equivalentEmptySet(Set<T> set) {
+ if (set instanceof SortedSet) {
+ @SuppressWarnings("unchecked")
+ SortedSet<T> sset = (SortedSet<T>) set;
+ set = new TreeSet<T>(sset.comparator());
+ } else if (set != null) {
+ set = new HashSet<T>(set.size());
+ } else
+ set = new HashSet<T>();
+ return set;
+ }
}
--- a/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/remote/internal/ClientNotifForwarder.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
@@ -576,6 +576,7 @@ public abstract class ClientNotifForward
int notFoundCount = 0;
NotificationResult result = null;
+ long firstEarliest = -1;
while (result == null && !shouldStop()) {
NotificationResult nr;
@@ -598,6 +599,8 @@ public abstract class ClientNotifForward
return null;
startSequenceNumber = nr.getNextSequenceNumber();
+ if (firstEarliest < 0)
+ firstEarliest = nr.getEarliestSequenceNumber();
try {
// 1 notif to skip possible missing class
@@ -628,6 +631,17 @@ public abstract class ClientNotifForward
(notFoundCount == 1 ? "" : "s") +
" because classes were missing locally";
lostNotifs(msg, notFoundCount);
+ // Even if result.getEarliestSequenceNumber() is now greater than
+ // it was initially, meaning some notifs have been dropped
+ // from the buffer, we don't want the caller to see that
+ // because it is then likely to renotify about the lost notifs.
+ // So we put back the first value of earliestSequenceNumber
+ // that we saw.
+ if (result != null) {
+ result = new NotificationResult(
+ firstEarliest, result.getNextSequenceNumber(),
+ result.getTargetedNotifications());
+ }
}
return result;
--- a/src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/remote/internal/ProxyInputStream.java Sat Aug 02 16:37:20 2008 -0700
@@ -33,10 +33,8 @@ import org.omg.CORBA.Context;
import org.omg.CORBA.Context;
import org.omg.CORBA.NO_IMPLEMENT;
import org.omg.CORBA.ORB;
-import org.omg.CORBA.Principal;
import org.omg.CORBA.TypeCode;
import org.omg.CORBA.portable.BoxedValueHelper;
-import org.omg.CORBA_2_3.portable.InputStream;
@SuppressWarnings("deprecation")
public class ProxyInputStream extends org.omg.CORBA_2_3.portable.InputStream {
@@ -160,54 +158,71 @@ public class ProxyInputStream extends or
return in.read_any();
}
- public Principal read_Principal() {
+ /**
+ * @deprecated
+ */
+ @Override
+ @Deprecated
+ public org.omg.CORBA.Principal read_Principal() {
return in.read_Principal();
}
+ @Override
public int read() throws IOException {
return in.read();
}
+ @Override
public BigDecimal read_fixed() {
return in.read_fixed();
}
+ @Override
public Context read_Context() {
return in.read_Context();
}
+ @Override
public org.omg.CORBA.Object read_Object(java.lang.Class clz) {
return in.read_Object(clz);
}
+ @Override
public ORB orb() {
return in.orb();
}
+ @Override
public Serializable read_value() {
return narrow().read_value();
}
+ @Override
public Serializable read_value(Class clz) {
return narrow().read_value(clz);
}
+ @Override
public Serializable read_value(BoxedValueHelper factory) {
return narrow().read_value(factory);
}
+ @Override
public Serializable read_value(String rep_id) {
return narrow().read_value(rep_id);
}
+ @Override
public Serializable read_value(Serializable value) {
return narrow().read_value(value);
}
+ @Override
public Object read_abstract_interface() {
return narrow().read_abstract_interface();
}
+ @Override
public Object read_abstract_interface(Class clz) {
return narrow().read_abstract_interface(clz);
}
--- a/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java Sat Aug 02 16:37:20 2008 -0700
@@ -31,8 +31,6 @@ import java.lang.reflect.Method;
import java.lang.reflect.Method;
import java.rmi.Remote;
import java.rmi.RemoteException;
-import java.rmi.server.Operation;
-import java.rmi.server.RemoteCall;
import java.rmi.server.RemoteObject;
import java.rmi.server.RemoteRef;
@@ -54,7 +52,11 @@ public class ProxyRef implements RemoteR
ref.writeExternal(out);
}
- public void invoke(RemoteCall call) throws Exception {
+ /**
+ * @deprecated
+ */
+ @Deprecated
+ public void invoke(java.rmi.server.RemoteCall call) throws Exception {
ref.invoke(call);
}
@@ -63,7 +65,11 @@ public class ProxyRef implements RemoteR
return ref.invoke(obj, method, params, opnum);
}
- public void done(RemoteCall call) throws RemoteException {
+ /**
+ * @deprecated
+ */
+ @Deprecated
+ public void done(java.rmi.server.RemoteCall call) throws RemoteException {
ref.done(call);
}
@@ -71,7 +77,12 @@ public class ProxyRef implements RemoteR
return ref.getRefClass(out);
}
- public RemoteCall newCall(RemoteObject obj, Operation[] op, int opnum,
+ /**
+ * @deprecated
+ */
+ @Deprecated
+ public java.rmi.server.RemoteCall newCall(RemoteObject obj,
+ java.rmi.server.Operation[] op, int opnum,
long hash) throws RemoteException {
return ref.newCall(obj, op, opnum, hash);
}
--- a/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/remote/internal/ServerNotifForwarder.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
@@ -25,16 +25,16 @@
package com.sun.jmx.remote.internal;
+import com.sun.jmx.mbeanserver.Util;
import com.sun.jmx.remote.security.NotificationAccessController;
import com.sun.jmx.remote.util.ClassLogger;
import com.sun.jmx.remote.util.EnvHelp;
import java.io.IOException;
import java.security.AccessControlContext;
import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -67,9 +67,9 @@ public class ServerNotifForwarder {
connectionTimeout = EnvHelp.getServerConnectionTimeout(env);
checkNotificationEmission = EnvHelp.computeBooleanFromString(
env,
- "jmx.remote.x.check.notification.emission");
- notificationAccessController = (NotificationAccessController)
- env.get("com.sun.jmx.remote.notification.access.controller");
+ "jmx.remote.x.check.notification.emission",false);
+ notificationAccessController =
+ EnvHelp.getNotificationAccessController(env);
}
public Integer addNotificationListener(final ObjectName name,
@@ -88,9 +88,7 @@ public class ServerNotifForwarder {
checkMBeanPermission(name, "addNotificationListener");
if (notificationAccessController != null) {
notificationAccessController.addNotificationListener(
- connectionId,
- name,
- Subject.getSubject(AccessController.getContext()));
+ connectionId, name, getSubject());
}
try {
boolean instanceOf =
@@ -160,9 +158,7 @@ public class ServerNotifForwarder {
checkMBeanPermission(name, "removeNotificationListener");
if (notificationAccessController != null) {
notificationAccessController.removeNotificationListener(
- connectionId,
- name,
- Subject.getSubject(AccessController.getContext()));
+ connectionId, name, getSubject());
}
Exception re = null;
@@ -312,6 +308,10 @@ public class ServerNotifForwarder {
// PRIVATE METHODS
//----------------
+ private Subject getSubject() {
+ return Subject.getSubject(AccessController.getContext());
+ }
+
private void checkState() throws IOException {
synchronized(terminationLock) {
if (terminated) {
@@ -332,7 +332,13 @@ public class ServerNotifForwarder {
*/
private void checkMBeanPermission(final ObjectName name,
final String actions)
- throws InstanceNotFoundException, SecurityException {
+ throws InstanceNotFoundException, SecurityException {
+ checkMBeanPermission(mbeanServer, name, actions);
+ }
+
+ public static void checkMBeanPermission(
+ final MBeanServer mbs, final ObjectName name, final String actions)
+ throws InstanceNotFoundException, SecurityException {
SecurityManager sm = System.getSecurityManager();
if (sm != null) {
AccessControlContext acc = AccessController.getContext();
@@ -342,7 +348,7 @@ public class ServerNotifForwarder {
new PrivilegedExceptionAction<ObjectInstance>() {
public ObjectInstance run()
throws InstanceNotFoundException {
- return mbeanServer.getObjectInstance(name);
+ return mbs.getObjectInstance(name);
}
});
} catch (PrivilegedActionException e) {
@@ -364,14 +370,12 @@ public class ServerNotifForwarder {
TargetedNotification tn) {
try {
if (checkNotificationEmission) {
- checkMBeanPermission(name, "addNotificationListener");
+ checkMBeanPermission(
+ name, "addNotificationListener");
}
if (notificationAccessController != null) {
notificationAccessController.fetchNotification(
- connectionId,
- name,
- tn.getNotification(),
- Subject.getSubject(AccessController.getContext()));
+ connectionId, name, tn.getNotification(), getSubject());
}
return true;
} catch (SecurityException e) {
--- a/src/share/classes/com/sun/jmx/remote/security/FileLoginModule.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/remote/security/FileLoginModule.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc. 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
@@ -25,6 +25,7 @@
package com.sun.jmx.remote.security;
+import com.sun.jmx.mbeanserver.GetPropertyAction;
import java.io.BufferedInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -46,8 +47,6 @@ import com.sun.jmx.remote.util.ClassLogg
import com.sun.jmx.remote.util.ClassLogger;
import com.sun.jmx.remote.util.EnvHelp;
import sun.management.jmxremote.ConnectorBootstrap;
-
-import sun.security.action.GetPropertyAction;
/**
* This {@link LoginModule} performs file-based authentication.
@@ -479,7 +478,7 @@ public class FileLoginModule implements
if (userSuppliedPasswordFile || hasJavaHomePermission) {
throw e;
} else {
- FilePermission fp =
+ final FilePermission fp =
new FilePermission(passwordFileDisplayName, "read");
AccessControlException ace = new AccessControlException(
"access denied " + fp.toString());
@@ -488,10 +487,13 @@ public class FileLoginModule implements
}
}
try {
- BufferedInputStream bis = new BufferedInputStream(fis);
- userCredentials = new Properties();
- userCredentials.load(bis);
- bis.close();
+ final BufferedInputStream bis = new BufferedInputStream(fis);
+ try {
+ userCredentials = new Properties();
+ userCredentials.load(bis);
+ } finally {
+ bis.close();
+ }
} finally {
fis.close();
}
--- a/src/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/remote/security/JMXPluggableAuthenticator.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/remote/security/MBeanServerFileAccessController.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/remote/util/EnvHelp.java Sat Aug 02 16:37:20 2008 -0700
@@ -40,9 +40,6 @@ import java.util.TreeSet;
import java.util.TreeSet;
import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
import javax.management.ObjectName;
import javax.management.MBeanServer;
@@ -50,6 +47,9 @@ import javax.management.remote.JMXConnec
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXConnectorServerFactory;
import com.sun.jmx.mbeanserver.GetPropertyAction;
+import com.sun.jmx.remote.security.NotificationAccessController;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorServer;
public class EnvHelp {
@@ -346,7 +346,24 @@ public class EnvHelp {
*/
public static long getFetchTimeout(Map env) {
return getIntegerAttribute(env, FETCH_TIMEOUT, 60000L, 0,
- Long.MAX_VALUE);
+ Long.MAX_VALUE);
+ }
+
+ /**
+ * <p>Name of the attribute that specifies an object that will check
+ * accesses to add/removeNotificationListener and also attempts to
+ * receive notifications. The value associated with this attribute
+ * should be a <code>NotificationAccessController</code> object.
+ * The default value is null.</p>
+ * This field is not public because of its com.sun dependency.
+ */
+ public static final String NOTIF_ACCESS_CONTROLLER =
+ "com.sun.jmx.remote.notification.access.controller";
+
+ public static NotificationAccessController getNotificationAccessController(
+ Map env) {
+ return (env == null) ? null :
+ (NotificationAccessController) env.get(NOTIF_ACCESS_CONTROLLER);
}
/**
@@ -470,24 +487,24 @@ public class EnvHelp {
}
/**
- The value of this attribute, if present, is a string specifying
- what other attributes should not appear in
- JMXConnectorServer.getAttributes(). It is a space-separated
- list of attribute patterns, where each pattern is either an
- attribute name, or an attribute prefix followed by a "*"
- character. The "*" has no special significance anywhere except
- at the end of a pattern. By default, this list is added to the
- list defined by {@link #DEFAULT_HIDDEN_ATTRIBUTES} (which
- uses the same format). If the value of this attribute begins
- with an "=", then the remainder of the string defines the
- complete list of attribute patterns.
+ * The value of this attribute, if present, is a string specifying
+ * what other attributes should not appear in
+ * JMXConnectorServer.getAttributes(). It is a space-separated
+ * list of attribute patterns, where each pattern is either an
+ * attribute name, or an attribute prefix followed by a "*"
+ * character. The "*" has no special significance anywhere except
+ * at the end of a pattern. By default, this list is added to the
+ * list defined by {@link #DEFAULT_HIDDEN_ATTRIBUTES} (which
+ * uses the same format). If the value of this attribute begins
+ * with an "=", then the remainder of the string defines the
+ * complete list of attribute patterns.
*/
public static final String HIDDEN_ATTRIBUTES =
"jmx.remote.x.hidden.attributes";
/**
- Default list of attributes not to show.
- @see #HIDDEN_ATTRIBUTES
+ * Default list of attributes not to show.
+ * @see #HIDDEN_ATTRIBUTES
*/
/* This list is copied directly from the spec, plus
java.naming.security.*. Most of the attributes here would have
@@ -651,6 +668,8 @@ public class EnvHelp {
* @param env the environment map.
* @param prop the name of the property in the environment map whose
* returned string value must be converted into a boolean value.
+ * @param systemProperty if true, consult a system property of the
+ * same name if there is no entry in the environment map.
*
* @return
* <ul>
@@ -671,16 +690,73 @@ public class EnvHelp {
* @throws ClassCastException if {@code env.get(prop)} cannot be cast
* to {@code String}.
*/
- public static boolean computeBooleanFromString(Map env, String prop)
- throws IllegalArgumentException, ClassCastException {
+ public static boolean computeBooleanFromString(
+ Map env, String prop, boolean systemProperty) {
if (env == null)
throw new IllegalArgumentException("env map cannot be null");
+ // returns a default value of 'false' if no property is found...
+ return computeBooleanFromString(env,prop,systemProperty,false);
+ }
+
+ /**
+ * Computes a boolean value from a string value retrieved from a
+ * property in the given map.
+ *
+ * @param env the environment map.
+ * @param prop the name of the property in the environment map whose
+ * returned string value must be converted into a boolean value.
+ * @param systemProperty if true, consult a system property of the
+ * same name if there is no entry in the environment map.
+ * @param defaultValue a default value to return in case no property
+ * was defined.
+ *
+ * @return
+ * <ul>
+ * <li>{@code defaultValue} if {@code env.get(prop)} is {@code null}
+ * and {@code systemProperty} is {@code false}</li>
+ * <li>{@code defaultValue} if {@code env.get(prop)} is {@code null}
+ * and {@code systemProperty} is {@code true} and
+ * {@code System.getProperty(prop)} is {@code null}</li>
+ * <li>{@code false} if {@code env.get(prop)} is {@code null}
+ * and {@code systemProperty} is {@code true} and
+ * {@code System.getProperty(prop).equalsIgnoreCase("false")}
+ * is {@code true}</li>
+ * <li>{@code true} if {@code env.get(prop)} is {@code null}
+ * and {@code systemProperty} is {@code true} and
+ * {@code System.getProperty(prop).equalsIgnoreCase("true")}
+ * is {@code true}</li>
+ * <li>{@code false} if
+ * {@code ((String)env.get(prop)).equalsIgnoreCase("false")}
+ * is {@code true}</li>
+ * <li>{@code true} if
+ * {@code ((String)env.get(prop)).equalsIgnoreCase("true")}
+ * is {@code true}</li>
+ * </ul>
+ *
+ * @throws IllegalArgumentException if {@code env} is {@code null} or
+ * {@code env.get(prop)} is not {@code null} and
+ * {@code ((String)env.get(prop)).equalsIgnoreCase("false")} and
+ * {@code ((String)env.get(prop)).equalsIgnoreCase("true")} are
+ * {@code false}.
+ * @throws ClassCastException if {@code env.get(prop)} cannot be cast
+ * to {@code String}.
+ */
+ public static boolean computeBooleanFromString(
+ Map env, String prop, boolean systemProperty, boolean defaultValue) {
+
+ if (env == null)
+ throw new IllegalArgumentException("env map cannot be null");
+
String stringBoolean = (String) env.get(prop);
+ if (stringBoolean == null && systemProperty) {
+ stringBoolean =
+ AccessController.doPrivileged(new GetPropertyAction(prop));
+ }
if (stringBoolean == null)
- return false;
+ return defaultValue;
else if (stringBoolean.equalsIgnoreCase("true"))
return true;
else if (stringBoolean.equalsIgnoreCase("false"))
@@ -703,6 +779,65 @@ public class EnvHelp {
return new Hashtable<K, V>(m);
}
+ /**
+ * Returns true if the parameter JMXConnector.USE_EVENT_SERVICE is set to a
+ * String equals "true" by ignoring case in the map or in the System.
+ */
+ public static boolean eventServiceEnabled(Map env) {
+ return computeBooleanFromString(env, JMXConnector.USE_EVENT_SERVICE, true);
+ }
+
+ /**
+ * Returns true if the parameter JMXConnectorServer.DELEGATE_TO_EVENT_SERVICE
+ * is set to a String equals "true" (ignores case).
+ * If the property DELEGATE_TO_EVENT_SERVICE is not set, returns
+ * a default value of "true".
+ */
+ public static boolean delegateToEventService(Map env) {
+ return computeBooleanFromString(env,
+ JMXConnectorServer.DELEGATE_TO_EVENT_SERVICE, true, true);
+ }
+
+// /**
+// * <p>Name of the attribute that specifies an EventRelay object to use.
+// */
+// public static final String EVENT_RELAY =
+// "jmx.remote.x.event.relay";
+//
+//
+// /**
+// * Returns an EventRelay object. The default one is FetchingEventRelay.
+// * If {@code EVENT_RELAY} is specified in {@code env} as a key,
+// * its value will be returned as an EventRelay object, if the value is
+// * not of type {@code EventRelay}, the default {@code FetchingEventRelay}
+// * will be returned.
+// * If {@code EVENT_RELAY} is not specified but {@code ENABLE_EVENT_RELAY}
+// * is specified as a key and its value is <code true>, the default {@code FetchingEventRelay}
+// * will be returned.
+// */
+// public static EventRelay getEventRelay(Map env) {
+// Map info = env == null ?
+// Collections.EMPTY_MAP : env;
+//
+// Object o = env.get(EVENT_RELAY);
+// if (o instanceof EventRelay) {
+// return (EventRelay)o;
+// } else if (o != null) {
+// logger.warning("getEventRelay",
+// "The user specified object is not an EventRelay object, " +
+// "using the default class FetchingEventRelay.");
+//
+// return new FetchingEventRelay();
+// }
+//
+// if (enableEventRelay(env)) {
+// return new FetchingEventRelay();
+// }
+//
+// return null;
+// }
+
+
private static final class SinkOutputStream extends OutputStream {
public void write(byte[] b, int off, int len) {}
public void write(int b) {}
--- a/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/jmx/snmp/tasks/ThreadService.java Sat Aug 02 16:37:20 2008 -0700
@@ -45,15 +45,9 @@ public class ThreadService implements Ta
minThreads = threadNumber;
threadList = new ExecutorThread[threadNumber];
-// for (int i=0; i<threadNumber; i++) {
-// threadList[i] = new ExecutorThread();
-// threadList[i].start();
-// }
-
priority = Thread.currentThread().getPriority();
cloader = Thread.currentThread().getContextClassLoader();
-//System.out.println("---jsl: ThreadService: running threads = "+threadNumber);
}
// public methods
@@ -89,7 +83,6 @@ public class ThreadService implements Ta
synchronized(jobList) {
jobList.add(jobList.size(), task);
-//System.out.println("jsl-ThreadService: added job "+addedJobs++);
jobList.notify();
}
@@ -196,8 +189,6 @@ public class ThreadService implements Ta
try {
idle--;
job.run();
-//System.out.println("jsl-ThreadService: done job "+doneJobs++);
-
} catch (Exception e) {
// TODO
e.printStackTrace();
@@ -228,7 +219,6 @@ public class ThreadService implements Ta
ExecutorThread et = new ExecutorThread();
et.start();
threadList[currThreds++] = et;
-//System.out.println("jsl-ThreadService: create new thread: "+currThreds);
}
}
}
--- a/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/management/HotSpotDiagnosticMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/security/auth/login/ConfigFile.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/security/auth/login/ConfigFile.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpecList.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpecList.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/expr/LValue.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/expr/LValue.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/Env.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/Env.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2002 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/Main.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/Main.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/build.xml Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/build.xml Sat Aug 02 16:37:20 2008 -0700
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/AbstractJavaHeapObjectVisitor.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/ArrayTypeCodes.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/HackJavaValue.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaBoolean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaByte.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaChar.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaClass.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaClass.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaDouble.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaField.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaField.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaFloat.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaFloat.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObject.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaHeapObjectVisitor.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaInt.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaInt.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaLazyReadObject.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaLong.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaLong.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaObject.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaObject.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectArray.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaObjectRef.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaShort.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaShort.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaStatic.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaThing.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaThing.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaValue.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaValue.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/JavaValueArray.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludes.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/ReachableExcludesImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/ReachableObjects.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/ReferenceChain.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/Root.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/Root.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/Snapshot.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/StackFrame.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/StackFrame.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/model/StackTrace.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/oql/OQLEngine.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/oql/OQLException.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/oql/OQLException.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/oql/OQLQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/oql/ObjectVisitor.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/parser/FileReadBuffer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/parser/HprofReader.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/parser/MappedReadBuffer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/parser/PositionDataInputStream.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/parser/PositionInputStream.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/parser/ReadBuffer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/parser/Reader.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/parser/Reader.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/AllClassesQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/AllRootsQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/ClassQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/FinalizerObjectsQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/FinalizerSummaryQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/HistogramQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/HttpReader.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/InstancesCountQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/InstancesQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/OQLHelp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/OQLQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/ObjectQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/PlatformClasses.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/QueryHandler.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/QueryListener.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/QueryListener.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/ReachableQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/RefsByTypeQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/RootStackQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/server/RootsQuery.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/ArraySorter.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/util/Comparer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/Comparer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/CompositeEnumeration.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/util/Misc.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/Misc.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/internal/util/VectorSorter.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/hat/resources/hat.js Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/hat/resources/hat.js Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/AbstractLauncher.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/ClassTypeImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/ClassTypeImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/ConcreteMethodImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/EventSetImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/EventSetImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/JNITypeParser.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/JNITypeParser.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/MethodImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/MethodImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/ObjectReferenceImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/PacketStream.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/PacketStream.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/ReferenceTypeImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/SDE.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/SDE.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/StackFrameImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/StackFrameImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/TargetVM.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/TargetVM.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/ThreadGroupReferenceImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/com/sun/tools/jdi/VirtualMachineManagerImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/Button.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/Button.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/Color.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/Color.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/Container.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/Container.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/DefaultKeyboardFocusManager.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/DefaultKeyboardFocusManager.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/Font.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/Font.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/GradientPaint.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/GradientPaint.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2002 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/KeyboardFocusManager.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/KeyboardFocusManager.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/LinearGradientPaint.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/LinearGradientPaint.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2006-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2006-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/MenuItem.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/MenuItem.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/Paint.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/Paint.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/RadialGradientPaint.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/RadialGradientPaint.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2006-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/TexturePaint.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/TexturePaint.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/color/ColorSpace.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/color/ColorSpace.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/color/ICC_ColorSpace.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/color/ICC_ColorSpace.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/color/ICC_Profile.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/color/ICC_Profile.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/color/ICC_ProfileGray.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/color/ICC_ProfileGray.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/color/ICC_ProfileRGB.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/color/ICC_ProfileRGB.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/dnd/DropTargetEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/dnd/DropTargetEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/event/AdjustmentEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/event/AdjustmentEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/event/ComponentEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/event/ComponentEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/event/ContainerEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/event/ContainerEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/event/FocusEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/event/FocusEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/event/InputEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/event/InputEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/event/ItemEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/event/ItemEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/event/MouseEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/event/MouseEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/event/PaintEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/event/PaintEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/event/WindowEvent.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/event/WindowEvent.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/font/OpenType.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/font/OpenType.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-1999 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/BandedSampleModel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/BandedSampleModel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/BufferedImage.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/BufferedImage.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/ColorConvertOp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/ColorConvertOp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/ComponentSampleModel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/ComponentSampleModel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/DataBuffer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/DataBuffer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/DataBufferByte.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/DataBufferByte.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/DataBufferInt.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/DataBufferInt.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/DataBufferShort.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/DataBufferShort.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/DataBufferUShort.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/DataBufferUShort.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/MultiPixelPackedSampleModel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/Raster.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/Raster.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/RenderedImage.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/RenderedImage.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/SampleModel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/SampleModel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/SinglePixelPackedSampleModel.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2001 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/WritableRaster.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/WritableRaster.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/WritableRenderedImage.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/WritableRenderedImage.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1997-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/renderable/ContextualRenderedImageFactory.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1998-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/renderable/RenderContext.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/renderable/RenderContext.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1998-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/renderable/RenderableImage.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/renderable/RenderableImage.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1998-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/renderable/RenderableImageOp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/renderable/RenderableImageOp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1998-2000 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/renderable/RenderableImageProducer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/awt/image/renderable/RenderedImageFactory.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/awt/image/renderable/RenderedImageFactory.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 1998 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/beans/EventHandler.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/beans/EventHandler.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/io/File.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/io/File.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/io/FileInputStream.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/io/FileInputStream.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/io/FileOutputStream.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/io/FileOutputStream.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/io/ObjectInputStream.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/io/ObjectInputStream.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/io/ObjectStreamClass.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/io/ObjectStreamClass.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/Class.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/Class.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/ClassLoader.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/ClassLoader.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/Compiler.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/Compiler.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/Long.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/Long.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/Package.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/Package.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/Process.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/Process.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/StringCoding.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/StringCoding.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/instrument/Instrumentation.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/instrument/Instrumentation.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/ClassLoadingMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/ClassLoadingMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/CompilationMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/CompilationMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/GarbageCollectorMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/GarbageCollectorMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/ManagementFactory.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/ManagementFactory.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/MemoryMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/MemoryMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/MemoryManagerMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/MemoryManagerMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/MemoryPoolMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/MemoryPoolMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/OperatingSystemMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/OperatingSystemMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/RuntimeMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/RuntimeMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/ThreadInfo.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/ThreadInfo.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/management/ThreadMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/management/ThreadMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/ref/Finalizer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/ref/Finalizer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/reflect/AccessibleObject.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/reflect/AccessibleObject.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/reflect/Modifier.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/reflect/Modifier.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/lang/reflect/Proxy.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/lang/reflect/Proxy.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/AbstractPlainSocketImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/AbstractPlainSocketImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/CookieHandler.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/CookieHandler.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/CookieManager.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/CookieManager.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/DatagramSocket.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/DatagramSocket.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/HttpCookie.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/HttpCookie.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/Inet6Address.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/Inet6Address.java Sat Aug 02 16:37:20 2008 -0700
@@ -25,12 +25,9 @@
package java.net;
-import java.security.AccessController;
import java.io.ObjectInputStream;
import java.io.IOException;
-import java.io.ObjectStreamException;
import java.io.InvalidObjectException;
-import sun.security.action.*;
import java.util.Enumeration;
/**
@@ -358,13 +355,13 @@ class Inet6Address extends InetAddress {
}
private int deriveNumericScope (NetworkInterface ifc) throws UnknownHostException {
- Enumeration addresses = ifc.getInetAddresses();
+ Enumeration<InetAddress> addresses = ifc.getInetAddresses();
while (addresses.hasMoreElements()) {
- InetAddress address = (InetAddress)addresses.nextElement();
- if (!(address instanceof Inet6Address)) {
+ InetAddress addr = addresses.nextElement();
+ if (!(addr instanceof Inet6Address)) {
continue;
}
- Inet6Address ia6_addr = (Inet6Address)address;
+ Inet6Address ia6_addr = (Inet6Address)addr;
/* check if site or link local prefixes match */
if (!differentLocalAddressTypes(ia6_addr)){
/* type not the same, so carry on searching */
@@ -377,22 +374,22 @@ class Inet6Address extends InetAddress {
}
private int deriveNumericScope (String ifname) throws UnknownHostException {
- Enumeration en;
+ Enumeration<NetworkInterface> en;
try {
en = NetworkInterface.getNetworkInterfaces();
} catch (SocketException e) {
throw new UnknownHostException ("could not enumerate local network interfaces");
}
while (en.hasMoreElements()) {
- NetworkInterface ifc = (NetworkInterface)en.nextElement();
+ NetworkInterface ifc = en.nextElement();
if (ifc.getName().equals (ifname)) {
Enumeration addresses = ifc.getInetAddresses();
while (addresses.hasMoreElements()) {
- InetAddress address = (InetAddress)addresses.nextElement();
- if (!(address instanceof Inet6Address)) {
+ InetAddress addr = (InetAddress)addresses.nextElement();
+ if (!(addr instanceof Inet6Address)) {
continue;
}
- Inet6Address ia6_addr = (Inet6Address)address;
+ Inet6Address ia6_addr = (Inet6Address)addr;
/* check if site or link local prefixes match */
if (!differentLocalAddressTypes(ia6_addr)){
/* type not the same, so carry on searching */
@@ -420,21 +417,22 @@ class Inet6Address extends InetAddress {
if (ifname != null && !"".equals (ifname)) {
try {
scope_ifname = NetworkInterface.getByName(ifname);
- try {
- scope_id = deriveNumericScope (scope_ifname);
- } catch (UnknownHostException e) {
- // should not happen
- assert false;
+ if (scope_ifname == null) {
+ /* the interface does not exist on this system, so we clear
+ * the scope information completely */
+ scope_id_set = false;
+ scope_ifname_set = false;
+ scope_id = 0;
+ } else {
+ try {
+ scope_id = deriveNumericScope (scope_ifname);
+ } catch (UnknownHostException e) {
+ // should not happen
+ assert false;
+ }
}
} catch (SocketException e) {}
- if (scope_ifname == null) {
- /* the interface does not exist on this system, so we clear
- * the scope information completely */
- scope_id_set = false;
- scope_ifname_set = false;
- scope_id = 0;
- }
}
/* if ifname was not supplied, then the numeric info is used */
@@ -460,6 +458,7 @@ class Inet6Address extends InetAddress {
* an IP multicast address
* @since JDK1.1
*/
+ @Override
public boolean isMulticastAddress() {
return ((ipaddress[0] & 0xff) == 0xff);
}
@@ -470,6 +469,7 @@ class Inet6Address extends InetAddress {
* a wildcard address.
* @since 1.4
*/
+ @Override
public boolean isAnyLocalAddress() {
byte test = 0x00;
for (int i = 0; i < INADDRSZ; i++) {
@@ -485,6 +485,7 @@ class Inet6Address extends InetAddress {
* a loopback address; or false otherwise.
* @since 1.4
*/
+ @Override
public boolean isLoopbackAddress() {
byte test = 0x00;
for (int i = 0; i < 15; i++) {
@@ -500,6 +501,7 @@ class Inet6Address extends InetAddress {
* a link local address; or false if address is not a link local unicast address.
* @since 1.4
*/
+ @Override
public boolean isLinkLocalAddress() {
return ((ipaddress[0] & 0xff) == 0xfe
&& (ipaddress[1] & 0xc0) == 0x80);
@@ -512,6 +514,7 @@ class Inet6Address extends InetAddress {
* a site local address; or false if address is not a site local unicast address.
* @since 1.4
*/
+ @Override
public boolean isSiteLocalAddress() {
return ((ipaddress[0] & 0xff) == 0xfe
&& (ipaddress[1] & 0xc0) == 0xc0);
@@ -525,6 +528,7 @@ class Inet6Address extends InetAddress {
* of global scope or it is not a multicast address
* @since 1.4
*/
+ @Override
public boolean isMCGlobal() {
return ((ipaddress[0] & 0xff) == 0xff
&& (ipaddress[1] & 0x0f) == 0x0e);
@@ -538,6 +542,7 @@ class Inet6Address extends InetAddress {
* of node-local scope or it is not a multicast address
* @since 1.4
*/
+ @Override
public boolean isMCNodeLocal() {
return ((ipaddress[0] & 0xff) == 0xff
&& (ipaddress[1] & 0x0f) == 0x01);
@@ -551,6 +556,7 @@ class Inet6Address extends InetAddress {
* of link-local scope or it is not a multicast address
* @since 1.4
*/
+ @Override
public boolean isMCLinkLocal() {
return ((ipaddress[0] & 0xff) == 0xff
&& (ipaddress[1] & 0x0f) == 0x02);
@@ -564,6 +570,7 @@ class Inet6Address extends InetAddress {
* of site-local scope or it is not a multicast address
* @since 1.4
*/
+ @Override
public boolean isMCSiteLocal() {
return ((ipaddress[0] & 0xff) == 0xff
&& (ipaddress[1] & 0x0f) == 0x05);
@@ -578,6 +585,7 @@ class Inet6Address extends InetAddress {
* or it is not a multicast address
* @since 1.4
*/
+ @Override
public boolean isMCOrgLocal() {
return ((ipaddress[0] & 0xff) == 0xff
&& (ipaddress[1] & 0x0f) == 0x08);
@@ -590,6 +598,7 @@ class Inet6Address extends InetAddress {
*
* @return the raw IP address of this object.
*/
+ @Override
public byte[] getAddress() {
return ipaddress.clone();
}
@@ -624,6 +633,7 @@ class Inet6Address extends InetAddress {
*
* @return the raw IP address in a string format.
*/
+ @Override
public String getHostAddress() {
String s = numericToTextFormat(ipaddress);
if (scope_ifname_set) { /* must check this first */
@@ -639,6 +649,7 @@ class Inet6Address extends InetAddress {
*
* @return a hash code value for this IP address.
*/
+ @Override
public int hashCode() {
if (ipaddress != null) {
@@ -677,6 +688,7 @@ class Inet6Address extends InetAddress {
* <code>false</code> otherwise.
* @see java.net.InetAddress#getAddress()
*/
+ @Override
public boolean equals(Object obj) {
if (obj == null ||
!(obj instanceof Inet6Address))
--- a/src/share/classes/java/net/InterfaceAddress.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/InterfaceAddress.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/NetworkInterface.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/NetworkInterface.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/ResponseCache.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/ResponseCache.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/ServerSocket.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/ServerSocket.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/SocksSocketImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/SocksSocketImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/URI.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/URI.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/URL.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/URL.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/URLClassLoader.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/URLClassLoader.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/net/URLConnection.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/net/URLConnection.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/nio/StringCharBuffer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/nio/StringCharBuffer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/nio/channels/Channels.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/nio/channels/Channels.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/nio/channels/SelectionKey.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/nio/channels/SelectionKey.java Sat Aug 02 16:37:20 2008 -0700
@@ -191,7 +191,7 @@ public abstract class SelectionKey {
* @throws IllegalArgumentException
* If a bit in the set does not correspond to an operation that
* is supported by this key's channel, that is, if
- * <tt>set & ~(channel().validOps()) != 0</tt>
+ * <tt>(ops & ~channel().validOps()) != 0</tt>
*
* @throws CancelledKeyException
* If this key has been cancelled
--- a/src/share/classes/java/nio/channels/spi/AbstractSelector.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/nio/channels/spi/AbstractSelector.java Sat Aug 02 16:37:20 2008 -0700
@@ -82,7 +82,7 @@ public abstract class AbstractSelector
this.provider = provider;
}
- private final Set cancelledKeys = new HashSet();
+ private final Set<SelectionKey> cancelledKeys = new HashSet<SelectionKey>();
void cancel(SelectionKey k) { // package-private
synchronized (cancelledKeys) {
--- a/src/share/classes/java/nio/channels/spi/SelectorProvider.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/nio/channels/spi/SelectorProvider.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/nio/charset/Charset-X-Coder.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/nio/charset/Charset-X-Coder.java Sat Aug 02 16:37:20 2008 -0700
@@ -303,7 +303,7 @@ public abstract class Charset$Coder$ {
#if[encoder]
- private WeakReference cachedDecoder = null;
+ private WeakReference<CharsetDecoder> cachedDecoder = null;
/**
* Tells whether or not the given byte array is a legal replacement value
@@ -322,13 +322,13 @@ public abstract class Charset$Coder$ {
* is a legal replacement value for this encoder
*/
public boolean isLegalReplacement(byte[] repl) {
- WeakReference wr = cachedDecoder;
+ WeakReference<CharsetDecoder> wr = cachedDecoder;
CharsetDecoder dec = null;
- if ((wr == null) || ((dec = (CharsetDecoder)wr.get()) == null)) {
+ if ((wr == null) || ((dec = wr.get()) == null)) {
dec = charset().newDecoder();
dec.onMalformedInput(CodingErrorAction.REPORT);
dec.onUnmappableCharacter(CodingErrorAction.REPORT);
- cachedDecoder = new WeakReference(dec);
+ cachedDecoder = new WeakReference<CharsetDecoder>(dec);
} else {
dec.reset();
}
--- a/src/share/classes/java/nio/charset/Charset.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/nio/charset/Charset.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
@@ -379,7 +379,7 @@ public abstract class Charset
}
// Thread-local gate to prevent recursive provider lookups
- private static ThreadLocal gate = new ThreadLocal();
+ private static ThreadLocal<ThreadLocal> gate = new ThreadLocal<ThreadLocal>();
private static Charset lookupViaProviders(final String charsetName) {
@@ -539,9 +539,9 @@ public abstract class Charset
// Fold charsets from the given iterator into the given map, ignoring
// charsets whose names already have entries in the map.
//
- private static void put(Iterator i, Map m) {
+ private static void put(Iterator<Charset> i, Map<String,Charset> m) {
while (i.hasNext()) {
- Charset cs = (Charset)i.next();
+ Charset cs = i.next();
if (!m.containsKey(cs.name()))
m.put(cs.name(), cs);
}
@@ -623,7 +623,7 @@ public abstract class Charset
private final String name; // tickles a bug in oldjavac
private final String[] aliases; // tickles a bug in oldjavac
- private Set aliasSet = null;
+ private Set<String> aliasSet = null;
/**
* Initializes a new charset with the given canonical name and alias
@@ -665,7 +665,7 @@ public abstract class Charset
if (aliasSet != null)
return aliasSet;
int n = aliases.length;
- HashSet hs = new HashSet(n);
+ HashSet<String> hs = new HashSet<String>(n);
for (int i = 0; i < n; i++)
hs.add(aliases[i]);
aliasSet = Collections.unmodifiableSet(hs);
--- a/src/share/classes/java/nio/charset/CoderResult.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/nio/charset/CoderResult.java Sat Aug 02 16:37:20 2008 -0700
@@ -194,7 +194,7 @@ public class CoderResult {
private static abstract class Cache {
- private Map cache = null;
+ private Map<Integer,WeakReference<CoderResult>> cache = null;
protected abstract CoderResult create(int len);
@@ -202,16 +202,16 @@ public class CoderResult {
if (len <= 0)
throw new IllegalArgumentException("Non-positive length");
Integer k = new Integer(len);
- WeakReference w;
+ WeakReference<CoderResult> w;
CoderResult e = null;
if (cache == null) {
- cache = new HashMap();
- } else if ((w = (WeakReference)cache.get(k)) != null) {
- e = (CoderResult)w.get();
+ cache = new HashMap<Integer,WeakReference<CoderResult>>();
+ } else if ((w = cache.get(k)) != null) {
+ e = w.get();
}
if (e == null) {
e = create(len);
- cache.put(k, new WeakReference(e));
+ cache.put(k, new WeakReference<CoderResult>(e));
}
return e;
}
--- a/src/share/classes/java/rmi/activation/ActivationGroupDesc.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/rmi/activation/ActivationGroupDesc.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/rmi/dgc/VMID.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/rmi/dgc/VMID.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/security/BasicPermission.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/security/BasicPermission.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/security/KeyStore.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/security/KeyStore.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/security/cert/TrustAnchor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/security/cert/TrustAnchor.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2001-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2001-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/security/cert/X509CertSelector.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/security/cert/X509CertSelector.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/text/DictionaryBasedBreakIterator.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/text/DictionaryBasedBreakIterator.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/text/MessageFormat.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/text/MessageFormat.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1996-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1996-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/ArrayList.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/ArrayList.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/Arrays.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/Arrays.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/EnumMap.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/EnumMap.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/HashMap.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/HashMap.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1997-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1997-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/Hashtable.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/Hashtable.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/JumboEnumSet.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/JumboEnumSet.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/Random.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/Random.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1995-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1995-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/Timer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/Timer.java Sat Aug 02 16:37:20 2008 -0700
@@ -25,6 +25,7 @@
package java.util;
import java.util.Date;
+import java.util.concurrent.atomic.AtomicInteger;
/**
* A facility for threads to schedule tasks for future execution in a
@@ -116,12 +117,11 @@ public class Timer {
};
/**
- * This ID is used to generate thread names. (It could be replaced
- * by an AtomicInteger as soon as they become available.)
- */
- private static int nextSerialNumber = 0;
- private static synchronized int serialNumber() {
- return nextSerialNumber++;
+ * This ID is used to generate thread names.
+ */
+ private static AtomicInteger nextSerialNumber = new AtomicInteger(0);
+ private static int serialNumber() {
+ return nextSerialNumber.getAndIncrement();
}
/**
--- a/src/share/classes/java/util/TreeSet.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/TreeSet.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/Vector.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/Vector.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1994-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1994-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/WeakHashMap.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/WeakHashMap.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1998-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1998-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/concurrent/ScheduledThreadPoolExecutor.java Sat Aug 02 16:37:20 2008 -0700
@@ -223,8 +223,7 @@ public class ScheduledThreadPoolExecutor
}
public long getDelay(TimeUnit unit) {
- long d = unit.convert(time - now(), TimeUnit.NANOSECONDS);
- return d;
+ return unit.convert(time - now(), TimeUnit.NANOSECONDS);
}
public int compareTo(Delayed other) {
@@ -264,7 +263,7 @@ public class ScheduledThreadPoolExecutor
if (p > 0)
time += p;
else
- time = now() - p;
+ time = triggerTime(-p);
}
public boolean cancel(boolean mayInterruptIfRunning) {
@@ -473,6 +472,38 @@ public class ScheduledThreadPoolExecutor
}
/**
+ * Returns the trigger time of a delayed action.
+ */
+ private long triggerTime(long delay, TimeUnit unit) {
+ return triggerTime(unit.toNanos((delay < 0) ? 0 : delay));
+ }
+
+ /**
+ * Returns the trigger time of a delayed action.
+ */
+ long triggerTime(long delay) {
+ return now() +
+ ((delay < (Long.MAX_VALUE >> 1)) ? delay : overflowFree(delay));
+ }
+
+ /**
+ * Constrains the values of all delays in the queue to be within
+ * Long.MAX_VALUE of each other, to avoid overflow in compareTo.
+ * This may occur if a task is eligible to be dequeued, but has
+ * not yet been, while some other task is added with a delay of
+ * Long.MAX_VALUE.
+ */
+ private long overflowFree(long delay) {
+ Delayed head = (Delayed) super.getQueue().peek();
+ if (head != null) {
+ long headDelay = head.getDelay(TimeUnit.NANOSECONDS);
+ if (headDelay < 0 && (delay - headDelay < 0))
+ delay = Long.MAX_VALUE + headDelay;
+ }
+ return delay;
+ }
+
+ /**
* @throws RejectedExecutionException {@inheritDoc}
* @throws NullPointerException {@inheritDoc}
*/
@@ -481,10 +512,9 @@ public class ScheduledThreadPoolExecutor
TimeUnit unit) {
if (command == null || unit == null)
throw new NullPointerException();
- if (delay < 0) delay = 0;
- long triggerTime = now() + unit.toNanos(delay);
RunnableScheduledFuture<?> t = decorateTask(command,
- new ScheduledFutureTask<Void>(command, null, triggerTime));
+ new ScheduledFutureTask<Void>(command, null,
+ triggerTime(delay, unit)));
delayedExecute(t);
return t;
}
@@ -498,10 +528,9 @@ public class ScheduledThreadPoolExecutor
TimeUnit unit) {
if (callable == null || unit == null)
throw new NullPointerException();
- if (delay < 0) delay = 0;
- long triggerTime = now() + unit.toNanos(delay);
RunnableScheduledFuture<V> t = decorateTask(callable,
- new ScheduledFutureTask<V>(callable, triggerTime));
+ new ScheduledFutureTask<V>(callable,
+ triggerTime(delay, unit)));
delayedExecute(t);
return t;
}
@@ -519,12 +548,10 @@ public class ScheduledThreadPoolExecutor
throw new NullPointerException();
if (period <= 0)
throw new IllegalArgumentException();
- if (initialDelay < 0) initialDelay = 0;
- long triggerTime = now() + unit.toNanos(initialDelay);
ScheduledFutureTask<Void> sft =
new ScheduledFutureTask<Void>(command,
null,
- triggerTime,
+ triggerTime(initialDelay, unit),
unit.toNanos(period));
RunnableScheduledFuture<Void> t = decorateTask(command, sft);
sft.outerTask = t;
@@ -545,12 +572,10 @@ public class ScheduledThreadPoolExecutor
throw new NullPointerException();
if (delay <= 0)
throw new IllegalArgumentException();
- if (initialDelay < 0) initialDelay = 0;
- long triggerTime = now() + unit.toNanos(initialDelay);
ScheduledFutureTask<Void> sft =
new ScheduledFutureTask<Void>(command,
null,
- triggerTime,
+ triggerTime(initialDelay, unit),
unit.toNanos(-delay));
RunnableScheduledFuture<Void> t = decorateTask(command, sft);
sft.outerTask = t;
--- a/src/share/classes/java/util/logging/Logging.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/logging/Logging.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/logging/LoggingMXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/logging/LoggingMXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2003-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2003-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/prefs/AbstractPreferences.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/prefs/AbstractPreferences.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/prefs/Preferences.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/prefs/Preferences.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/regex/Matcher.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/regex/Matcher.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/java/util/regex/Pattern.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/java/util/regex/Pattern.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/imageio/stream/ImageInputStreamImpl.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/AndQueryExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/AndQueryExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/AttributeValueExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/AttributeValueExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2004 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/BetweenQueryExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/BetweenQueryExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/BinaryOpValueExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/BinaryOpValueExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/BinaryRelQueryExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/BinaryRelQueryExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/BooleanValueExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/BooleanValueExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/ImmutableDescriptor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/ImmutableDescriptor.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2004-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2004-2008 Sun Microsystems, Inc. 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
@@ -25,6 +25,7 @@
package javax.management;
+import com.sun.jmx.mbeanserver.Util;
import java.io.InvalidObjectException;
import java.lang.reflect.Array;
import java.util.Arrays;
@@ -127,13 +128,13 @@ public class ImmutableDescriptor impleme
* @throws InvalidObjectException if the read object has invalid fields.
*/
private Object readResolve() throws InvalidObjectException {
- if (names.length == 0 && getClass() == ImmutableDescriptor.class)
- return EMPTY_DESCRIPTOR;
boolean bad = false;
if (names == null || values == null || names.length != values.length)
bad = true;
if (!bad) {
+ if (names.length == 0 && getClass() == ImmutableDescriptor.class)
+ return EMPTY_DESCRIPTOR;
final Comparator<String> compare = String.CASE_INSENSITIVE_ORDER;
String lastName = ""; // also catches illegal null name
for (int i = 0; i < names.length; i++) {
@@ -362,6 +363,7 @@ public class ImmutableDescriptor impleme
*/
// Note: this Javadoc is copied from javax.management.Descriptor
// due to 6369229.
+ @Override
public boolean equals(Object o) {
if (o == this)
return true;
@@ -410,29 +412,15 @@ public class ImmutableDescriptor impleme
*/
// Note: this Javadoc is copied from javax.management.Descriptor
// due to 6369229.
+ @Override
public int hashCode() {
if (hashCode == -1) {
- int hash = 0;
- for (int i = 0; i < names.length; i++) {
- Object v = values[i];
- int h;
- if (v == null)
- h = 0;
- else if (v instanceof Object[])
- h = Arrays.deepHashCode((Object[]) v);
- else if (v.getClass().isArray()) {
- h = Arrays.deepHashCode(new Object[] {v}) - 31;
- // hashcode of a list containing just v is
- // v.hashCode() + 31, see List.hashCode()
- } else
- h = v.hashCode();
- hash += names[i].toLowerCase().hashCode() ^ h;
- }
- hashCode = hash;
+ hashCode = Util.hashCode(names, values);
}
return hashCode;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder("{");
for (int i = 0; i < names.length; i++) {
@@ -479,6 +467,7 @@ public class ImmutableDescriptor impleme
* If the descriptor construction fails for any reason, this exception will
* be thrown.
*/
+ @Override
public Descriptor clone() {
return this;
}
--- a/src/share/classes/javax/management/InQueryExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/InQueryExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/JMX.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/JMX.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/MBeanRegistration.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/MBeanRegistration.java Sat Aug 02 16:37:20 2008 -0700
@@ -158,7 +158,19 @@ public interface MBeanRegistration {
/**
* Allows the MBean to perform any operations needed after having been
* registered in the MBean server or after the registration has failed.
- *
+ * <p>If the implementation of this method throws a {@link RuntimeException}
+ * or an {@link Error}, the MBean Server will rethrow those inside
+ * a {@link RuntimeMBeanException} or {@link RuntimeErrorException},
+ * respectively. However, throwing an exception in {@code postRegister}
+ * will not change the state of the MBean:
+ * if the MBean was already registered ({@code registrationDone} is
+ * {@code true}), the MBean will remain registered. </p>
+ * <p>This might be confusing for the code calling {@code createMBean()}
+ * or {@code registerMBean()}, as such code might assume that MBean
+ * registration has failed when such an exception is raised.
+ * Therefore it is recommended that implementations of
+ * {@code postRegister} do not throw Runtime Exceptions or Errors if it
+ * can be avoided.</p>
* @param registrationDone Indicates whether or not the MBean has
* been successfully registered in the MBean server. The value
* false means that the registration phase has failed.
@@ -178,6 +190,17 @@ public interface MBeanRegistration {
/**
* Allows the MBean to perform any operations needed after having been
* unregistered in the MBean server.
+ * <p>If the implementation of this method throws a {@link RuntimeException}
+ * or an {@link Error}, the MBean Server will rethrow those inside
+ * a {@link RuntimeMBeanException} or {@link RuntimeErrorException},
+ * respectively. However, throwing an excepption in {@code postDeregister}
+ * will not change the state of the MBean:
+ * the MBean was already successfully deregistered and will remain so. </p>
+ * <p>This might be confusing for the code calling
+ * {@code unregisterMBean()}, as it might assume that MBean deregistration
+ * has failed. Therefore it is recommended that implementations of
+ * {@code postDeregister} do not throw Runtime Exceptions or Errors if it
+ * can be avoided.</p>
*/
public void postDeregister();
--- a/src/share/classes/javax/management/MBeanServer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/MBeanServer.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
@@ -328,11 +328,30 @@ public interface MBeanServer extends MBe
* <CODE>preRegister</CODE> (<CODE>MBeanRegistration</CODE>
* interface) method of the MBean has thrown an exception. The
* MBean will not be registered.
+ * @exception RuntimeMBeanException If the <CODE>postRegister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws a
+ * <CODE>RuntimeException</CODE>, the <CODE>registerMBean<CODE> method will
+ * throw a <CODE>RuntimeMBeanException</CODE>, although the MBean
+ * registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>registerMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeMBeanException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
+ * @exception RuntimeErrorException If the <CODE>postRegister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws an
+ * <CODE>Error</CODE>, the <CODE>registerMBean<CODE> method will
+ * throw a <CODE>RuntimeErrorException</CODE>, although the MBean
+ * registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>registerMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeErrorException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
* @exception NotCompliantMBeanException This object is not a JMX
* compliant MBean
* @exception RuntimeOperationsException Wraps a
* <CODE>java.lang.IllegalArgumentException</CODE>: The object
* passed in parameter is null or no object name is specified.
+ * @see javax.management.MBeanRegistration
*/
public ObjectInstance registerMBean(Object object, ObjectName name)
throws InstanceAlreadyExistsException, MBeanRegistrationException,
@@ -401,7 +420,13 @@ public interface MBeanServer extends MBe
// doc comment inherited from MBeanServerConnection
public String[] getDomains();
- // doc comment inherited from MBeanServerConnection
+ // doc comment inherited from MBeanServerConnection, plus:
+ /**
+ * {@inheritDoc}
+ * If the source of the notification
+ * is a reference to an MBean object, the MBean server will replace it
+ * by that MBean's ObjectName. Otherwise the source is unchanged.
+ */
public void addNotificationListener(ObjectName name,
NotificationListener listener,
NotificationFilter filter,
--- a/src/share/classes/javax/management/MBeanServerConnection.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/MBeanServerConnection.java Sat Aug 02 16:37:20 2008 -0700
@@ -29,6 +29,7 @@ package javax.management;
// java import
import java.io.IOException;
import java.util.Set;
+import javax.management.event.NotificationManager;
/**
@@ -39,7 +40,7 @@ import java.util.Set;
*
* @since 1.5
*/
-public interface MBeanServerConnection {
+public interface MBeanServerConnection extends NotificationManager {
/**
* <p>Instantiates and registers an MBean in the MBean server. The
* MBean server will use its {@link
@@ -75,6 +76,24 @@ public interface MBeanServerConnection {
* <CODE>preRegister</CODE> (<CODE>MBeanRegistration</CODE>
* interface) method of the MBean has thrown an exception. The
* MBean will not be registered.
+ * @exception RuntimeMBeanException If the <CODE>postRegister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws a
+ * <CODE>RuntimeException</CODE>, the <CODE>createMBean<CODE> method will
+ * throw a <CODE>RuntimeMBeanException</CODE>, although the MBean creation
+ * and registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>createMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeMBeanException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
+ * @exception RuntimeErrorException If the <CODE>postRegister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws an
+ * <CODE>Error</CODE>, the <CODE>createMBean<CODE> method will
+ * throw a <CODE>RuntimeErrorException</CODE>, although the MBean creation
+ * and registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>createMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeErrorException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
* @exception MBeanException The constructor of the MBean has
* thrown an exception
* @exception NotCompliantMBeanException This class is not a JMX
@@ -86,7 +105,7 @@ public interface MBeanServerConnection {
* is specified for the MBean.
* @exception IOException A communication problem occurred when
* talking to the MBean server.
- *
+ * @see javax.management.MBeanRegistration
*/
public ObjectInstance createMBean(String className, ObjectName name)
throws ReflectionException, InstanceAlreadyExistsException,
@@ -129,6 +148,24 @@ public interface MBeanServerConnection {
* <CODE>preRegister</CODE> (<CODE>MBeanRegistration</CODE>
* interface) method of the MBean has thrown an exception. The
* MBean will not be registered.
+ * @exception RuntimeMBeanException If the <CODE>postRegister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws a
+ * <CODE>RuntimeException</CODE>, the <CODE>createMBean<CODE> method will
+ * throw a <CODE>RuntimeMBeanException</CODE>, although the MBean creation
+ * and registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>createMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeMBeanException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
+ * @exception RuntimeErrorException If the <CODE>postRegister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws an
+ * <CODE>Error</CODE>, the <CODE>createMBean<CODE> method will
+ * throw a <CODE>RuntimeErrorException</CODE>, although the MBean creation
+ * and registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>createMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeErrorException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
* @exception MBeanException The constructor of the MBean has
* thrown an exception
* @exception NotCompliantMBeanException This class is not a JMX
@@ -142,6 +179,7 @@ public interface MBeanServerConnection {
* is specified for the MBean.
* @exception IOException A communication problem occurred when
* talking to the MBean server.
+ * @see javax.management.MBeanRegistration
*/
public ObjectInstance createMBean(String className, ObjectName name,
ObjectName loaderName)
@@ -185,6 +223,24 @@ public interface MBeanServerConnection {
* <CODE>preRegister</CODE> (<CODE>MBeanRegistration</CODE>
* interface) method of the MBean has thrown an exception. The
* MBean will not be registered.
+ * @exception RuntimeMBeanException If the <CODE>postRegister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws a
+ * <CODE>RuntimeException</CODE>, the <CODE>createMBean<CODE> method will
+ * throw a <CODE>RuntimeMBeanException</CODE>, although the MBean creation
+ * and registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>createMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeMBeanException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
+ * @exception RuntimeErrorException If the <CODE>postRegister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws an
+ * <CODE>Error</CODE>, the <CODE>createMBean<CODE> method will
+ * throw a <CODE>RuntimeErrorException</CODE>, although the MBean creation
+ * and registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>createMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeErrorException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
* @exception MBeanException The constructor of the MBean has
* thrown an exception
* @exception NotCompliantMBeanException This class is not a JMX
@@ -196,7 +252,7 @@ public interface MBeanServerConnection {
* is specified for the MBean.
* @exception IOException A communication problem occurred when
* talking to the MBean server.
- *
+ * @see javax.management.MBeanRegistration
*/
public ObjectInstance createMBean(String className, ObjectName name,
Object params[], String signature[])
@@ -239,6 +295,24 @@ public interface MBeanServerConnection {
* <CODE>preRegister</CODE> (<CODE>MBeanRegistration</CODE>
* interface) method of the MBean has thrown an exception. The
* MBean will not be registered.
+ * @exception RuntimeMBeanException If the <CODE>postRegister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws a
+ * <CODE>RuntimeException</CODE>, the <CODE>createMBean<CODE> method will
+ * throw a <CODE>RuntimeMBeanException</CODE>, although the MBean creation
+ * and registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>createMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeMBeanException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
+ * @exception RuntimeErrorException If the <CODE>postRegister</CODE> method
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws an
+ * <CODE>Error</CODE>, the <CODE>createMBean<CODE> method will
+ * throw a <CODE>RuntimeErrorException</CODE>, although the MBean creation
+ * and registration succeeded. In such a case, the MBean will be actually
+ * registered even though the <CODE>createMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeErrorException</CODE> can
+ * also be thrown by <CODE>preRegister</CODE>, in which case the MBean
+ * will not be registered.
* @exception MBeanException The constructor of the MBean has
* thrown an exception
* @exception NotCompliantMBeanException This class is not a JMX
@@ -252,7 +326,7 @@ public interface MBeanServerConnection {
* is specified for the MBean.
* @exception IOException A communication problem occurred when
* talking to the MBean server.
- *
+ * @see javax.management.MBeanRegistration
*/
public ObjectInstance createMBean(String className, ObjectName name,
ObjectName loaderName, Object params[],
@@ -275,6 +349,24 @@ public interface MBeanServerConnection {
* @exception MBeanRegistrationException The preDeregister
* ((<CODE>MBeanRegistration</CODE> interface) method of the MBean
* has thrown an exception.
+ * @exception RuntimeMBeanException If the <CODE>postDeregister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws a
+ * <CODE>RuntimeException</CODE>, the <CODE>unregisterMBean<CODE> method
+ * will throw a <CODE>RuntimeMBeanException</CODE>, although the MBean
+ * unregistration succeeded. In such a case, the MBean will be actually
+ * unregistered even though the <CODE>unregisterMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeMBeanException</CODE> can
+ * also be thrown by <CODE>preDeregister</CODE>, in which case the MBean
+ * will remain registered.
+ * @exception RuntimeErrorException If the <CODE>postDeregister</CODE>
+ * (<CODE>MBeanRegistration</CODE> interface) method of the MBean throws an
+ * <CODE>Error</CODE>, the <CODE>unregisterMBean<CODE> method will
+ * throw a <CODE>RuntimeErrorException</CODE>, although the MBean
+ * unregistration succeeded. In such a case, the MBean will be actually
+ * unregistered even though the <CODE>unregisterMBean<CODE> method
+ * threw an exception. Note that <CODE>RuntimeMBeanException</CODE> can
+ * also be thrown by <CODE>preDeregister</CODE>, in which case the MBean
+ * will remain registered.
* @exception RuntimeOperationsException Wraps a
* <CODE>java.lang.IllegalArgumentException</CODE>: The object
* name in parameter is null or the MBean you are when trying to
@@ -282,7 +374,7 @@ public interface MBeanServerConnection {
* MBeanServerDelegate} MBean.
* @exception IOException A communication problem occurred when
* talking to the MBean server.
- *
+ * @see javax.management.MBeanRegistration
*/
public void unregisterMBean(ObjectName name)
throws InstanceNotFoundException, MBeanRegistrationException,
@@ -585,32 +677,7 @@ public interface MBeanServerConnection {
public String[] getDomains()
throws IOException;
- /**
- * <p>Adds a listener to a registered MBean.</p>
- *
- * <P> A notification emitted by an MBean will be forwarded by the
- * MBeanServer to the listener. If the source of the notification
- * is a reference to an MBean object, the MBean server will replace it
- * by that MBean's ObjectName. Otherwise the source is unchanged.
- *
- * @param name The name of the MBean on which the listener should
- * be added.
- * @param listener The listener object which will handle the
- * notifications emitted by the registered MBean.
- * @param filter The filter object. If filter is null, no
- * filtering will be performed before handling notifications.
- * @param handback The context to be sent to the listener when a
- * notification is emitted.
- *
- * @exception InstanceNotFoundException The MBean name provided
- * does not match any of the registered MBeans.
- * @exception IOException A communication problem occurred when
- * talking to the MBean server.
- *
- * @see #removeNotificationListener(ObjectName, NotificationListener)
- * @see #removeNotificationListener(ObjectName, NotificationListener,
- * NotificationFilter, Object)
- */
+ // doc inherited from NotificationManager
public void addNotificationListener(ObjectName name,
NotificationListener listener,
NotificationFilter filter,
@@ -727,65 +794,13 @@ public interface MBeanServerConnection {
throws InstanceNotFoundException, ListenerNotFoundException,
IOException;
-
- /**
- * <p>Removes a listener from a registered MBean.</p>
- *
- * <P> If the listener is registered more than once, perhaps with
- * different filters or callbacks, this method will remove all
- * those registrations.
- *
- * @param name The name of the MBean on which the listener should
- * be removed.
- * @param listener The listener to be removed.
- *
- * @exception InstanceNotFoundException The MBean name provided
- * does not match any of the registered MBeans.
- * @exception ListenerNotFoundException The listener is not
- * registered in the MBean.
- * @exception IOException A communication problem occurred when
- * talking to the MBean server.
- *
- * @see #addNotificationListener(ObjectName, NotificationListener,
- * NotificationFilter, Object)
- */
+ // doc inherited from NotificationManager
public void removeNotificationListener(ObjectName name,
NotificationListener listener)
throws InstanceNotFoundException, ListenerNotFoundException,
IOException;
- /**
- * <p>Removes a listener from a registered MBean.</p>
- *
- * <p>The MBean must have a listener that exactly matches the
- * given <code>listener</code>, <code>filter</code>, and
- * <code>handback</code> parameters. If there is more than one
- * such listener, only one is removed.</p>
- *
- * <p>The <code>filter</code> and <code>handback</code> parameters
- * may be null if and only if they are null in a listener to be
- * removed.</p>
- *
- * @param name The name of the MBean on which the listener should
- * be removed.
- * @param listener The listener to be removed.
- * @param filter The filter that was specified when the listener
- * was added.
- * @param handback The handback that was specified when the
- * listener was added.
- *
- * @exception InstanceNotFoundException The MBean name provided
- * does not match any of the registered MBeans.
- * @exception ListenerNotFoundException The listener is not
- * registered in the MBean, or it is not registered with the given
- * filter and handback.
- * @exception IOException A communication problem occurred when
- * talking to the MBean server.
- *
- * @see #addNotificationListener(ObjectName, NotificationListener,
- * NotificationFilter, Object)
- *
- */
+ // doc inherited from NotificationManager
public void removeNotificationListener(ObjectName name,
NotificationListener listener,
NotificationFilter filter,
--- a/src/share/classes/javax/management/MBeanServerInvocationHandler.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/MBeanServerInvocationHandler.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/MBeanServerNotification.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/MBeanServerNotification.java Sat Aug 02 16:37:20 2008 -0700
@@ -38,56 +38,64 @@ package javax.management;
*
* @since 1.5
*/
- public class MBeanServerNotification extends Notification {
+public class MBeanServerNotification extends Notification {
- /* Serial version */
- private static final long serialVersionUID = 2876477500475969677L;
+ /* Serial version */
+ private static final long serialVersionUID = 2876477500475969677L;
+ /**
+ * Notification type denoting that an MBean has been registered.
+ * Value is "JMX.mbean.registered".
+ */
+ public static final String REGISTRATION_NOTIFICATION =
+ "JMX.mbean.registered";
+ /**
+ * Notification type denoting that an MBean has been unregistered.
+ * Value is "JMX.mbean.unregistered".
+ */
+ public static final String UNREGISTRATION_NOTIFICATION =
+ "JMX.mbean.unregistered";
+ /**
+ * @serial The object names of the MBeans concerned by this notification
+ */
+ private final ObjectName objectName;
- /**
- * Notification type denoting that an MBean has been registered. Value is "JMX.mbean.registered".
- */
- public static final String REGISTRATION_NOTIFICATION = "JMX.mbean.registered" ;
+ /**
+ * Creates an MBeanServerNotification object specifying object names of
+ * the MBeans that caused the notification and the specified notification
+ * type.
+ *
+ * @param type A string denoting the type of the
+ * notification. Set it to one these values: {@link
+ * #REGISTRATION_NOTIFICATION}, {@link
+ * #UNREGISTRATION_NOTIFICATION}.
+ * @param source The MBeanServerNotification object responsible
+ * for forwarding MBean server notification.
+ * @param sequenceNumber A sequence number that can be used to order
+ * received notifications.
+ * @param objectName The object name of the MBean that caused the
+ * notification.
+ *
+ */
+ public MBeanServerNotification(String type, Object source,
+ long sequenceNumber, ObjectName objectName) {
+ super(type, source, sequenceNumber);
+ this.objectName = objectName;
+ }
- /**
- * Notification type denoting that an MBean has been unregistered. Value is "JMX.mbean.unregistered".
- */
- public static final String UNREGISTRATION_NOTIFICATION = "JMX.mbean.unregistered" ;
+ /**
+ * Returns the object name of the MBean that caused the notification.
+ *
+ * @return the object name of the MBean that caused the notification.
+ */
+ public ObjectName getMBeanName() {
+ return objectName;
+ }
+ @Override
+ public String toString() {
+ return super.toString() + "[mbeanName=" + objectName + "]";
- /**
- * @serial The object names of the MBeans concerned by this notification
- */
- private final ObjectName objectName;
-
-
- /**
- * Creates an MBeanServerNotification object specifying object names of
- * the MBeans that caused the notification and the specified notification type.
- *
- * @param type A string denoting the type of the
- * notification. Set it to one these values: {@link
- * #REGISTRATION_NOTIFICATION}, {@link
- * #UNREGISTRATION_NOTIFICATION}.
- * @param source The MBeanServerNotification object responsible
- * for forwarding MBean server notification.
- * @param sequenceNumber A sequence number that can be used to order
- * received notifications.
- * @param objectName The object name of the MBean that caused the notification.
- *
- */
- public MBeanServerNotification(String type, Object source, long sequenceNumber, ObjectName objectName ) {
- super (type,source,sequenceNumber) ;
- this.objectName = objectName ;
- }
-
- /**
- * Returns the object name of the MBean that caused the notification.
- *
- * @return the object name of the MBean that caused the notification.
- */
- public ObjectName getMBeanName() {
- return objectName ;
- }
+ }
}
--- a/src/share/classes/javax/management/MXBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/MXBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
@@ -33,7 +33,6 @@ import java.lang.annotation.Target;
import java.lang.annotation.Target;
// remaining imports are for Javadoc
-import java.beans.ConstructorProperties;
import java.io.InvalidObjectException;
import java.lang.management.MemoryUsage;
import java.lang.reflect.UndeclaredThrowableException;
@@ -865,7 +864,8 @@ public interface ModuleMXBean {
<em>J</em>.</p></li>
<li><p>Otherwise, if <em>J</em> has at least one public
- constructor with a {@link ConstructorProperties} annotation, then one
+ constructor with a {@link java.beans.ConstructorProperties
+ ConstructorProperties} annotation, then one
of those constructors (not necessarily always the same one)
will be called to reconstruct an instance of <em>J</em>.
Every such annotation must list as many strings as the
--- a/src/share/classes/javax/management/MatchQueryExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/MatchQueryExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/NotQueryExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/NotQueryExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/NumericValueExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/NumericValueExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/ObjectName.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/ObjectName.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
@@ -38,9 +38,6 @@ import java.util.HashMap;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
-import javax.management.QueryExp;
/**
* <p>Represents the object name of an MBean, or a pattern that can
@@ -1160,9 +1157,19 @@ public class ObjectName implements Compa
//
//in.defaultReadObject();
final ObjectInputStream.GetField fields = in.readFields();
+ String propListString =
+ (String)fields.get("propertyListString", "");
+
+ // 6616825: take care of property patterns
+ final boolean propPattern =
+ fields.get("propertyPattern" , false);
+ if (propPattern) {
+ propListString =
+ (propListString.length()==0?"*":(propListString+",*"));
+ }
+
cn = (String)fields.get("domain", "default")+
- ":"+
- (String)fields.get("propertyListString", "");
+ ":"+ propListString;
} else {
// Read an object serialized in the new serial form
//
@@ -1796,6 +1803,7 @@ public class ObjectName implements Compa
* @return True if <code>object</code> is an ObjectName whose
* canonical form is equal to that of this ObjectName.
*/
+ @Override
public boolean equals(Object object) {
// same object case
@@ -1819,6 +1827,7 @@ public class ObjectName implements Compa
* Returns a hash code for this object name.
*
*/
+ @Override
public int hashCode() {
return _canonicalName.hashCode();
}
--- a/src/share/classes/javax/management/OrQueryExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/OrQueryExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/QualifiedAttributeValueExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/QualifiedAttributeValueExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/Query.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/Query.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/QueryEval.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/QueryEval.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/QueryExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/QueryExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2003 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/QueryNotificationFilter.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/QueryNotificationFilter.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/QueryParser.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/QueryParser.java Sat Aug 02 16:37:20 2008 -0700
@@ -312,7 +312,7 @@ class QueryParser {
if (e > 0)
ss = s.substring(0, e);
ss = ss.replace("0", "").replace(".", "");
- if (!ss.isEmpty())
+ if (!ss.equals(""))
throw new NumberFormatException("Underflow: " + s);
}
return d;
--- a/src/share/classes/javax/management/StandardMBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/StandardMBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/StringValueExp.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/StringValueExp.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
@@ -85,6 +85,7 @@ public class StringValueExp implements V
/* There is no need for this method, because if a query is being
evaluated a StringValueExp can only appear inside a QueryExp,
and that QueryExp will itself have done setMBeanServer. */
+ @Deprecated
public void setMBeanServer(MBeanServer s) { }
/**
--- a/src/share/classes/javax/management/loading/MLet.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/loading/MLet.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
@@ -1154,21 +1154,29 @@ public class MLet extends java.net.URLCl
*/
private synchronized String loadLibraryAsResource(String libname) {
try {
- InputStream is = getResourceAsStream(libname.replace(File.separatorChar,'/'));
+ InputStream is = getResourceAsStream(
+ libname.replace(File.separatorChar,'/'));
if (is != null) {
- File directory = new File(libraryDirectory);
- directory.mkdirs();
- File file = File.createTempFile(libname + ".", null, directory);
- file.deleteOnExit();
- FileOutputStream fileOutput = new FileOutputStream(file);
- int c;
- while ((c = is.read()) != -1) {
- fileOutput.write(c);
- }
- is.close();
- fileOutput.close();
- if (file.exists()) {
- return file.getAbsolutePath();
+ try {
+ File directory = new File(libraryDirectory);
+ directory.mkdirs();
+ File file = File.createTempFile(libname + ".", null,
+ directory);
+ file.deleteOnExit();
+ FileOutputStream fileOutput = new FileOutputStream(file);
+ try {
+ int c;
+ while ((c = is.read()) != -1) {
+ fileOutput.write(c);
+ }
+ } finally {
+ fileOutput.close();
+ }
+ if (file.exists()) {
+ return file.getAbsolutePath();
+ }
+ } finally {
+ is.close();
}
}
} catch (Exception e) {
--- a/src/share/classes/javax/management/loading/MLetParser.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/loading/MLetParser.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/modelmbean/DescriptorSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/modelmbean/DescriptorSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 2000-2008 Sun Microsystems, Inc. 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
@@ -33,6 +33,7 @@ import static com.sun.jmx.defaults.JmxPr
import static com.sun.jmx.defaults.JmxProperties.MODELMBEAN_LOGGER;
import static com.sun.jmx.mbeanserver.Util.cast;
import com.sun.jmx.mbeanserver.GetPropertyAction;
+import com.sun.jmx.mbeanserver.Util;
import java.io.IOException;
import java.io.ObjectInputStream;
@@ -774,6 +775,7 @@ public class DescriptorSupport
* fails for any reason, this exception will be thrown.
*/
+ @Override
public synchronized Object clone() throws RuntimeOperationsException {
if (MODELMBEAN_LOGGER.isLoggable(Level.FINEST)) {
MODELMBEAN_LOGGER.logp(Level.FINEST,
@@ -814,13 +816,16 @@ public class DescriptorSupport
* otherwise.
*
*/
- // XXXX TODO: This is not very efficient!
// Note: this Javadoc is copied from javax.management.Descriptor
// due to 6369229.
+ @Override
public synchronized boolean equals(Object o) {
if (o == this)
return true;
-
+ if (! (o instanceof Descriptor))
+ return false;
+ if (o instanceof ImmutableDescriptor)
+ return o.equals(this);
return new ImmutableDescriptor(descriptorMap).equals(o);
}
@@ -844,11 +849,16 @@ public class DescriptorSupport
* @return A hash code value for this object.
*
*/
- // XXXX TODO: This is not very efficient!
// Note: this Javadoc is copied from javax.management.Descriptor
// due to 6369229.
+ @Override
public synchronized int hashCode() {
- return new ImmutableDescriptor(descriptorMap).hashCode();
+ final int size = descriptorMap.size();
+ // descriptorMap is sorted with a comparator that ignores cases.
+ //
+ return Util.hashCode(
+ descriptorMap.keySet().toArray(new String[size]),
+ descriptorMap.values().toArray(new Object[size]));
}
/**
@@ -1278,6 +1288,7 @@ public class DescriptorSupport
* field Names or field Values. If the descriptor string fails
* for any reason, this exception will be thrown.
*/
+ @Override
public synchronized String toString() {
if (MODELMBEAN_LOGGER.isLoggable(Level.FINEST)) {
MODELMBEAN_LOGGER.logp(Level.FINEST,
--- a/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/modelmbean/ModelMBeanAttributeInfo.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/modelmbean/ModelMBeanConstructorInfo.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/modelmbean/ModelMBeanInfoSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 2000-2008 Sun Microsystems, Inc. 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
@@ -373,7 +373,7 @@ public class ModelMBeanInfoSupport exten
"getDescriptors(String)", "Entry");
}
- if ((inDescriptorType == null) || (inDescriptorType.isEmpty())) {
+ if ((inDescriptorType == null) || (inDescriptorType.equals(""))) {
inDescriptorType = "all";
}
@@ -616,7 +616,7 @@ public class ModelMBeanInfoSupport exten
inDescriptor = new DescriptorSupport();
}
- if ((inDescriptorType == null) || (inDescriptorType.isEmpty())) {
+ if ((inDescriptorType == null) || (inDescriptorType.equals(""))) {
inDescriptorType =
(String) inDescriptor.getFieldValue("descriptorType");
--- a/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/modelmbean/ModelMBeanNotificationInfo.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/modelmbean/ModelMBeanOperationInfo.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/modelmbean/RequiredModelMBean.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Portions Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Portions Copyright 2000-2008 Sun Microsystems, Inc. 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
@@ -1123,7 +1123,7 @@ public class RequiredModelMBean
if (tracing) {
MODELMBEAN_LOGGER.logp(Level.FINER,
RequiredModelMBean.class.getName(),"resolveMethod",
- "resolving " + targetClass + "." + opMethodName);
+ "resolving " + targetClass.getName() + "." + opMethodName);
}
final Class[] argClasses;
--- a/src/share/classes/javax/management/monitor/CounterMonitor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/monitor/CounterMonitor.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/monitor/GaugeMonitor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/monitor/GaugeMonitor.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/monitor/Monitor.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/monitor/Monitor.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 1999-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 1999-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/ArrayType.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/ArrayType.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/CompositeDataInvocationHandler.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2005 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2005-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/CompositeType.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/CompositeType.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/MXBeanMapping.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/MXBeanMapping.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/MXBeanMappingClass.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/MXBeanMappingClass.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/MXBeanMappingFactory.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/MXBeanMappingFactory.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/MXBeanMappingFactoryClass.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/MXBeanMappingFactoryClass.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2007-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/OpenMBeanAttributeInfoSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/OpenMBeanConstructorInfoSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/OpenMBeanInfoSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/OpenMBeanOperationInfoSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/OpenType.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/OpenType.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/SimpleType.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/SimpleType.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/openmbean/TabularType.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/openmbean/TabularType.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/relation/RelationNotification.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/relation/RelationNotification.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/relation/RelationService.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/relation/RelationService.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
@@ -108,7 +108,7 @@ public class RelationService extends Not
// the value HashMap mapping:
// <relation id> -> ArrayList of <role name>
// to track where a given MBean is referenced.
- private Map<ObjectName,Map<String,List<String>>>
+ private final Map<ObjectName,Map<String,List<String>>>
myRefedMBeanObjName2RelIdsMap =
new HashMap<ObjectName,Map<String,List<String>>>();
@@ -1492,7 +1492,7 @@ public class RelationService extends Not
// Clones the list of notifications to be able to still receive new
// notifications while proceeding those ones
List<MBeanServerNotification> localUnregNtfList;
- synchronized(myUnregNtfList) {
+ synchronized(myRefedMBeanObjName2RelIdsMap) {
localUnregNtfList =
new ArrayList<MBeanServerNotification>(myUnregNtfList);
// Resets list
--- a/src/share/classes/javax/management/relation/RelationSupport.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/relation/RelationSupport.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2006 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2000-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/remote/JMXConnector.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/remote/JMXConnector.java Sat Aug 02 16:37:20 2008 -0700
@@ -56,6 +56,26 @@ public interface JMXConnector extends Cl
*/
public static final String CREDENTIALS =
"jmx.remote.credentials";
+
+ /**
+ * <p>Name of the attribute that specifies whether to use the
+ * {@linkplain javax.management.event Event Service} to handle
+ * notifications for this connector. The value associated with
+ * this attribute, if any, is a String, which must be equal,
+ * ignoring case, to {@code "true"} or {@code "false"}.</p>
+ *
+ * <p>Not all connectors will understand this attribute, but the
+ * standard {@linkplain javax.management.remote.rmi.RMIConnector
+ * RMI Connector} does.</p>
+ *
+ * <p>If this attribute is not present, then the system property of the
+ * same name (<code>{@value}</code>) is consulted. If that is not set
+ * either, then the Event Service is not used.</p>
+ *
+ * @since 1.7
+ */
+ public static final String USE_EVENT_SERVICE =
+ "jmx.remote.use.event.service";
/**
* <p>Establishes the connection to the connector server. This
--- a/src/share/classes/javax/management/remote/JMXConnectorFactory.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/remote/JMXConnectorFactory.java Sat Aug 02 16:37:20 2008 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2008 Sun Microsystems, Inc. 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
--- a/src/share/classes/javax/management/remote/JMXConnectorServer.java Sun Jul 27 17:16:44 2008 -0700
+++ b/src/share/classes/javax/management/remote/JMXConnectorServer.java Sat Aug 02 16:37:20 2008 -0700
@@ -26,17 +26,21 @@
package javax.management.remote;
+import com.sun.jmx.remote.util.EnvHelp;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.NoSuchElementException;
+import javax.management.MBeanInfo; // for javadoc
import javax.management.MBeanNotificationInfo;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
import javax.management.Notification;
import javax.management.NotificationBroadcasterSupport;
import javax.management.ObjectName;
+import javax.management.event.EventClientDelegate;
/**
* <p>Superclass of every connector server. A connector server is
@@ -75,6 +79,48 @@ public abstract class JMXConnectorServer
public static final String AUTHENTICATOR =
"jmx.remote.authenticator";
+ /**
+ * <p>Name of the attribute that specifies whether this connector
+ * server can delegate notification handling to the
+ * {@linkplain javax.management.event Event Service}.
+ * The value associated with
+ * this attribute, if any, is a String, which must be equal,
+ * ignoring case, to {@code "true"} or {@code "false"}.</p>
+ *
+ * <p>Not all connector servers will understand this attribute, but the
+ * standard {@linkplain javax.management.remote.rmi.RMIConnectorServer
+ * RMI Connector Server} does.</p>
+ *
+ * <p>If this attribute is not present, then the system property of the
+ * same name (<code>{@value}</code>) is consulted. If that is not set
+ * either, then the Event Service is used if the connector server
+ * supports it.</p>
+ *
+ * @since 1.7
+ */
+ public static final String DELEGATE_TO_EVENT_SERVICE =
+ "jmx.remote.delegate.event.service";
+
+ /**
+ * <p>Name of the attribute that specifies whether this connector
+ * server simulates the existence of the {@link EventClientDelegate}
+ * MBean. The value associated with this attribute, if any, must
+ * be a string that is equal to {@code "true"} or {@code "false"},
+ * ignoring case. If it is {@code "true"}, then the connector server
+ * will simulate an EventClientDelegate MBean, as described in {@link
+ * EventClientDelegate#newForwarder}. This MBean is needed for {@link
+ * javax.management.event.EventClient EventClient} to function correctly.</p>
+ *
+ * <p>Not all connector servers will understand this attribute, but the
+ * standard {@linkplain javax.management.remote.rmi.RMIConnectorServer
+ * RMI Connector Server} does. For a connector server that understands
+ * this attribute, the default value is {@code "true"}.</p>
+ *
+ * @since 1.7
+ */
+ public static final String EVENT_CLIENT_DELEGATE_FORWARDER =
+ "jmx.remote.event.client.delegate.forwarder";
+
/**
* <p>Constructs a connector server that will be registered as an
* MBean in the MBean server it is attached to. This constructor
@@ -89,34 +135,274 @@ public abstract class JMXConnectorServer
/**
* <p>Constructs a connector server that is attached to the given
* MBean server. A connector server that is created in this way
- * can be registered in a different MBean server.</p>
+ * can be registered in a different MBean server, or not registered
+ * in any MBean server.</p>
*
* @param mbeanServer the MBean server that this connector server
* is attached to. Null if this connector server will be attached
* to an MBean server by being registered in it.
*/
public JMXConnectorServer(MBeanServer mbeanServer) {
- this.mbeanServer = mbeanServer;
+ insertUserMBeanServer(mbeanServer);
}
/**
* <p>Returns the MBean server that this connector server is
- * attached to.</p>
+ * attached to, or the first in a chain of user-added
+ * {@link MBeanServerForwarder}s, if any.</p>
*
* @return the MBean server that this connector server is attached
* to, or null if it is not yet attached to an MBean server.
+ *
+ * @see #setMBeanServerForwarder
+ * @see #getSystemMBeanServer
*/
public synchronized MBeanServer getMBeanServer() {
- return mbeanServer;
- }
-
- public synchronized void setMBeanServerForwarder(MBeanServerForwarder mbsf)
- {
+ return userMBeanServer;
+ }
+
+ public synchronized void setMBeanServerForwarder(MBeanServerForwarder mbsf) {
if (mbsf == null)
throw new IllegalArgumentException("Invalid null argument: mbsf");
- if (mbeanServer != null) mbsf.setMBeanServer(mbeanServer);
- mbeanServer = mbsf;
+ if (userMBeanServer != null)
+ mbsf.setMBeanServer(userMBeanServer);
+ insertUserMBeanServer(mbsf);
+ }
+
+ /**
+ * <p>Remove a forwarder from the chain of forwarders. The forwarder can
+ * be in the system chain or the user chain. On successful return from
+ * this method, the first occurrence in the chain of an object that is
+ * {@linkplain Object#equals equal} to {@code mbsf} will have been
+ * removed.</p>
+ * @param mbsf the forwarder to remove
+ * @throws NoSuchElementException if there is no occurrence of {@code mbsf}
+ * in the chain.
+ * @throws IllegalArgumentException if {@code mbsf} is null.
+ */
+ public synchronized void removeMBeanServerForwarder(MBeanServerForwarder mbsf) {
+ if (mbsf == null)
+ throw new IllegalArgumentException("Invalid null argument: mbsf");
+
+ MBeanServerForwarder prev = null;
+ MBeanServer curr = systemMBeanServer;
+ while (curr instanceof MBeanServerForwarder && !mbsf.equals(curr)) {
+ prev = (MBeanServerForwarder) curr;
+ curr = prev.getMBeanServer();
+ }
+ if (!(curr instanceof MBeanServerForwarder))
+ throw new NoSuchElementException("MBeanServerForwarder not in chain");
+ MBeanServerForwarder deleted = (MBeanServerForwarder) curr;
+ MBeanServer next = deleted.getMBeanServer();
+ if (prev != null)
+ prev.setMBeanServer(next);
+ if (systemMBeanServer == deleted)
+ systemMBeanServer = next;
+ if (userMBeanServer == deleted)
+ userMBeanServer = next;
+ }
+
+ /*
+ * Set userMBeanServer to mbs and arrange for the end of the chain of
+ * system MBeanServerForwarders to point to it. See the comment before
+ * the systemMBeanServer and userMBeanServer field declarations.
+ */
+ private void insertUserMBeanServer(MBeanServer mbs) {
+ MBeanServerForwarder lastSystemMBSF = null;
+ for (MBeanServer mbsi = systemMBeanServer;
+ mbsi != userMBeanServer;
+ mbsi = lastSystemMBSF.getMBeanServer()) {
+ lastSystemMBSF = (MBeanServerForwarder) mbsi;
+ }
+ userMBeanServer = mbs;
+ if (lastSystemMBSF == null)
+ systemMBeanServer = mbs;
+ else
+ lastSystemMBSF.setMBeanServer(mbs);
+ }
+
+ /**
+ * <p>Returns the first item in the chain of system and then user
+ * forwarders. In the simplest case, a {@code JMXConnectorServer}
+ * is connected directly to an {@code MBeanServer}. But there can
+ * also be a chain of {@link MBeanServerForwarder}s between the two.
+ * This chain consists of two sub-chains: first the <em>system chain</em>
+ * and then the <em>user chain</em>. Incoming requests are given to the
+ * first forwarder in the system chain. Each forwarder can handle
+ * a request itself, or more usually forward it to the next forwarder,
+ * perhaps with some extra behavior such as logging or security
+ * checking before or after the forwarding. The last forwarder in
+ * the system chain is followed by the first forwarder in the user
+ * chain.</p>
+ *
+ * <p>The <em>system chain</em> is usually
+ * defined by a connector server based on the environment Map;
+ * see {@link JMXConnectorServerFactory#newJMXConnectorServer}. Allowing the
+ * connector server to define its forwarders in this way ensures that
+ * they are in the correct order - some forwarders need to be inserted
+ * before others for correct behavior. It is possible to modify the
+ * system chain, for example using {@link #setSystemMBeanServerForwarder} or
+ * {@link #removeMBeanServerForwarder}, but in that case the system
+ * chain is no longer guaranteed to be correct.</p>
+ *
+ * <p>The <em>user chain</em> is defined by calling {@link
+ * #setMBeanServerForwarder} to insert forwarders at the head of the user
+ * chain.</p>
+ *
+ * <p>If there are no forwarders in either chain, then both
+ * {@link #getMBeanServer()} and {@code getSystemMBeanServer()} will
+ * return the {@code MBeanServer} for this connector server. If there
+ * are forwarders in the user chain but not the system chain, then
+ * both methods will return the first forwarder in the user chain.
+ * If there are forwarders in the system chain but not the user chain,
+ * then {@code getSystemMBeanServer()} will return the first forwarder
+ * in the system chain, and {@code getMBeanServer()} will return the
+ * {@code MBeanServer} for this connector server. Finally, if there
+ * are forwarders in each chain then {@code getSystemMBeanServer()}
+ * will return the first forwarder in the system chain, and {@code
+ * getMBeanServer()} will return the first forwarder in the user chain.</p>
+ *
+ * <p>This code illustrates how the chains can be traversed:</p>
+ *
+ * <pre>
+ * JMXConnectorServer cs;
+ * System.out.println("system chain:");
+ * MBeanServer mbs = cs.getSystemMBeanServer();
+ * while (true) {
+ * if (mbs == cs.getMBeanServer())
+ * System.out.println("user chain:");
+ * if (!(mbs instanceof MBeanServerForwarder))
+ * break;
+ * MBeanServerForwarder mbsf = (MBeanServerForwarder) mbs;
+ * System.out.println("--forwarder: " + mbsf);
+ * mbs = mbsf.getMBeanServer();
+ * }
+ * System.out.println("--MBean Server");
+ * </pre>
+ *
+ * @return the first item in the system chain of forwarders.
+ *
+ * @see #setSystemMBeanServerForwarder
+ */
+ public synchronized MBeanServer getSystemMBeanServer() {
+ return systemMBeanServer;
+ }
+
+ /**
+ * <p>Inserts an object that intercepts requests for the MBean server
+ * that arrive through this connector server. This object will be
+ * supplied as the <code>MBeanServer</code> for any new connection
+ * created by this connector server. Existing connections are
+ * unaffected.</p>
+ *
+ * <p>This method can be called more than once with different
+ * {@link MBeanServerForwarder} objects. The result is a chain
+ * of forwarders. The last forwarder added is the first in the chain.</p>
+ *
+ * <p>This method modifies the system chain of {@link MBeanServerForwarder}s.
+ * Usually user code should change the user chain instead, via
+ * {@link #setMBeanServerForwarder}.</p>
+ *
+ * <p>Not all connector servers support a system chain of forwarders.
+ * Calling this method on a connector server that does not will produce an
+ * {@link UnsupportedOperationException}.</p>
+ *
+ * <p>Suppose {@code mbs} is the result of {@link #getSystemMBeanServer()}
+ * before calling this method. If {@code mbs} is not null, then
+ * {@code mbsf.setMBeanServer(mbs)} will be called. If doing so
+ * produces an exception, this method throws the same exception without
+ * any other effect. If {@code mbs} is null, or if the call to
+ * {@code mbsf.setMBeanServer(mbs)} succeeds, then this method will
+ * return normally and {@code getSystemMBeanServer()} will then return
+ * {@code mbsf}.</p>
+ *
+ * <p>The result of {@link #getMBeanServer()} is unchanged by this method.</p>
+ *
+ * @param mbsf the new <code>MBeanServerForwarder</code>.
+ *
+ * @throws IllegalArgumentException if the call to {@link
+ * MBeanServerForwarder#setMBeanServer mbsf.setMBeanServer} fails
+ * with <code>IllegalArgumentException</code>, or if
+ * <code>mbsf</code> is null.
+ *
+ * @throws UnsupportedOperationException if
+ * {@link #supportsSystemMBeanServerForwarder} returns false.
+ *
+ * @see #getSystemMBeanServer()
+ */
+ public synchronized void setSystemMBeanServerForwarder(
+ MBeanServerForwarder mbsf) {
+ if (mbsf == null)
+ throw new IllegalArgumentException("Invalid null argument: mbsf");
+ mustSupportSystemMBSF();
+
+ if (systemMBeanServer != null)
+ mbsf.setMBeanServer(systemMBeanServer);
+ systemMBeanServer = mbsf;
+ }
+
+ /**
+ * <p>Returns true if this connector server supports a system chain of
+ * {@link MBeanServerForwarder}s. The default implementation of this
+ * method returns false. Connector servers that do support the system
+ * chain must override this method to return true.
+ *
+ * @return true if this connector server supports the system chain of
+ * forwarders.
+ */
+ public boolean supportsSystemMBeanServerForwarder() {
+ return false;
+ }
+
+ private void mustSupportSystemMBSF() {
+ if (!supportsSystemMBeanServerForwarder()) {
+ throw new UnsupportedOperationException(
+ "System MBeanServerForwarder not supported by this " +
+ "connector server");
+ }
+ }
+
+ /**
+ * <p>Install {@link MBeanServerForwarder}s in the system chain
+ * based on the attributes in the given {@code Map}. A connector
+ * server that {@linkplain #supportsSystemMBeanServerForwarder supports}
+ * a system chain of {@code MBeanServerForwarder}s can call this method
+ * to add forwarders to that chain based on the contents of {@code env}.
+ * In order:</p>
+ *
+ * <ul>
+ *
+ * <li>If {@link #EVENT_CLIENT_DELEGATE_FORWARDER} is absent, or is
+ * present with the value {@code "true"}, then a forwarder with the
+ * functionality of {@link EventClientDelegate#newForwarder} is inserted
+ * at the start of the system chain.</li>
+ *
+ * </ul>
+ *
+ * <p>For {@code EVENT_CLIENT_DELEGATE_FORWARDER},