/hg/release/icedtea7-forest-2.4/jdk: 25 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Tue Jan 14 13:04:43 PST 2014
changeset 023b4d20e5b3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=023b4d20e5b3
author: coleenp
date: Mon Sep 16 14:22:17 2013 -0400
8021271: Better buffering in ObjC code
Summary: Improve buffering in ObjC code
Reviewed-by: serb, hseigel, coleenp
Contributed-by: gerard.ziemski at oracle.com
changeset ffc8f42ca4ab in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ffc8f42ca4ab
author: malenkov
date: Wed Oct 16 14:02:44 2013 +0400
8026172: Enhance UI Management
Reviewed-by: art, skoivu
changeset 627849ac0afe in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=627849ac0afe
author: sjiang
date: Mon Oct 21 17:47:56 2013 +0200
7068126: Enhance SNMP statuses
Reviewed-by: dfuchs, hawtin
changeset 0b5b1ebaf6f3 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0b5b1ebaf6f3
author: valeriep
date: Wed Aug 21 12:07:31 2013 -0700
8022927: Input validation for byte/endian conversions
Summary: Add additional boundary checks
Reviewed-by: ascarpino
changeset c25031871019 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=c25031871019
author: malenkov
date: Fri Oct 04 19:39:59 2013 +0400
8025448: Enhance listening events
Reviewed-by: art, skoivu
changeset 773d497db13f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=773d497db13f
author: prr
date: Tue Oct 15 11:34:38 2013 -0700
8026176: Enhance document printing
Reviewed-by: bae, jgodinez
changeset fd966e95c976 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=fd966e95c976
author: xuelei
date: Wed Oct 23 21:32:52 2013 -0700
8026417: Enhance XML canonicalization
Summary: Copy before use mutable byte arrays. Also reviewed by Alexander Fomin <alexander.fomin at oracle.com>
Reviewed-by: weijun, mullan, hawtin, ahgross
changeset 5e28e83a6e77 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=5e28e83a6e77
author: weijun
date: Mon Aug 19 22:43:32 2013 +0800
8022945: Enhance JNDI implementation classes
Reviewed-by: xuelei, ahgross, skoivu
changeset 4cae86c40f8f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=4cae86c40f8f
author: xuelei
date: Thu Sep 05 18:17:49 2013 -0700
8023069: Enhance TLS connections
Summary: Also reviewed by Alexander Fomin and Andrew Gross
Reviewed-by: wetmore
changeset d65b9bf7ae81 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=d65b9bf7ae81
author: malenkov
date: Mon Sep 02 16:56:33 2013 +0400
8023245: Enhance Beans decoding
Reviewed-by: art, skoivu, alanb
changeset 90acfb0a002e in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=90acfb0a002e
author: weijun
date: Fri Sep 13 15:17:31 2013 +0800
8024306: Enhance Subject consistency
Summary: Also reviewed by Alexander Fomin
Reviewed-by: mullan, ahgross
changeset 1d5230340e7d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=1d5230340e7d
author: xuelei
date: Mon Oct 14 18:35:40 2013 -0700
8025026: Enhance canonicalization
Summary: Don't use cached null xmlns definition. Also reviewed by Alexander Fomin <alexander.fomin at oracle.com>
Reviewed-by: mullan, hawtin
changeset 8bd89b349b90 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8bd89b349b90
author: michaelm
date: Fri Nov 01 10:40:56 2013 +0000
8011786: Better applet networking
Summary: add checkListen() to client socket binds and new interpretation for port number 0 in SocketPermission
Reviewed-by: chegar, alanb
changeset ee86b2ab6f6f in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=ee86b2ab6f6f
author: lancea
date: Thu Aug 15 11:46:56 2013 -0400
8022904: Enhance JDBC Parsers
Reviewed-by: alanb, skoivu
changeset 3abc29d93520 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3abc29d93520
author: vadim
date: Fri Sep 13 12:52:24 2013 +0400
8023057: Enhance start up image display
Reviewed-by: anthony, serb, mschoene
changeset 54d28cbd45ab in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=54d28cbd45ab
author: alanb
date: Thu Oct 24 19:21:52 2013 +0100
8021257: com.sun.corba.se.** should be on restricted package list
Reviewed-by: chegar, coffeys, smarks
Contributed-by: alan.bateman at oracle.com, mark.sheppard at oracle.com
changeset 0c8fb2be1513 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=0c8fb2be1513
author: jfranck
date: Fri Oct 11 11:22:21 2013 +0200
8023301: Enhance generic classes
Reviewed-by: mchung, hawtin
changeset 3f33242494f9 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3f33242494f9
author: weijun
date: Fri Sep 13 15:22:39 2013 +0800
8023672: Enhance jar file validation
Summary: Also reviewed by Chris Ries and Alexander Fomin
Reviewed-by: mullan, sherman
changeset 28bcccb5c6f2 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=28bcccb5c6f2
author: weijun
date: Thu Sep 19 10:40:16 2013 +0800
8024302: Clarify jar verifications
8023338: Update jarsigner to encourage timestamping
Reviewed-by: mullan, ahgross
changeset efb7a2cc14ed in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=efb7a2cc14ed
author: prr
date: Sun Oct 20 06:12:08 2013 -0700
8024530: Enhance font process resilience
Reviewed-by: mschoene, bae, srl, prr
changeset dbbdb5a3820d in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=dbbdb5a3820d
author: vadim
date: Thu Sep 19 20:56:20 2013 +0400
8025034: Improve layout lookups
Reviewed-by: mschoene, vadim, srl
changeset 9019f15ab597 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=9019f15ab597
author: dfuchs
date: Mon Oct 07 12:09:22 2013 +0200
8024867: Enhance logging start up
Reviewed-by: mchung, hawtin
changeset 3662dd5d130b in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=3662dd5d130b
author: weijun
date: Thu Oct 17 09:58:42 2013 +0800
8025014: Enhance Security Policy
6727821: Enhance JAAS Configuration
Reviewed-by: xuelei, hawtin
changeset 64a944a312e7 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=64a944a312e7
author: xuelei
date: Tue Oct 15 20:15:20 2013 -0700
8026204: Enhance auth login contexts
Summary: Enforce package access control with current context. Also reviewed by Alexander Fomin <alexander.fomin at oracle.com>
Reviewed-by: weijun, ahgross
changeset 8619fc74e196 in /hg/release/icedtea7-forest-2.4/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/jdk?cmd=changeset;node=8619fc74e196
author: xuelei
date: Wed Oct 16 20:12:52 2013 -0700
8025758: Enhance Naming management
Summary: Enforce package access control with current context. Also reviewed by Alexander Fomin <alexander.fomin at oracle.com>
Reviewed-by: weijun, ahgross
diffstat:
make/common/Release.gmk | 4 -
make/java/Makefile | 4 -
src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m | 4 +-
src/share/classes/com/sun/beans/decoder/DocumentHandler.java | 9 +
src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java | 18 +-
src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java | 12 +-
src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java | 16 +-
src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java | 21 +-
src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java | 16 +-
src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java | 30 +-
src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java | 3 -
src/share/classes/com/sun/naming/internal/FactoryEnumeration.java | 19 +-
src/share/classes/com/sun/naming/internal/VersionHelper12.java | 87 ++-
src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer11.java | 3 +-
src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315.java | 3 +-
src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/Canonicalizer20010315Excl.java | 2 +-
src/share/classes/com/sun/org/apache/xml/internal/security/c14n/implementations/CanonicalizerBase.java | 88 +-
src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java | 4 +-
src/share/classes/java/lang/SecurityManager.java | 8 +-
src/share/classes/java/net/Socket.java | 4 +
src/share/classes/java/net/SocketPermission.java | 113 +++-
src/share/classes/java/util/jar/JarVerifier.java | 4 +-
src/share/classes/java/util/logging/LogManager.java | 18 +
src/share/classes/javax/print/SimpleDoc.java | 5 +-
src/share/classes/javax/security/auth/Policy.java | 56 +-
src/share/classes/javax/security/auth/Subject.java | 4 +
src/share/classes/javax/security/auth/login/Configuration.java | 47 +-
src/share/classes/javax/security/auth/login/LoginContext.java | 154 ++--
src/share/classes/javax/sql/rowset/spi/SyncFactory.java | 26 +-
src/share/classes/javax/swing/SwingUtilities.java | 2 +
src/share/classes/javax/swing/event/EventListenerList.java | 5 +-
src/share/classes/sun/nio/ch/AsynchronousSocketChannelImpl.java | 4 +
src/share/classes/sun/nio/ch/SocketChannelImpl.java | 4 +
src/share/classes/sun/reflect/generics/reflectiveObjects/TypeVariableImpl.java | 21 +-
src/share/classes/sun/reflect/misc/ReflectUtil.java | 35 +
src/share/classes/sun/security/internal/spec/TlsRsaPremasterSecretParameterSpec.java | 53 +-
src/share/classes/sun/security/pkcs11/P11RSACipher.java | 27 +-
src/share/classes/sun/security/pkcs11/P11TlsRsaPremasterSecretGenerator.java | 44 +-
src/share/classes/sun/security/provider/ByteArrayAccess.java | 51 +-
src/share/classes/sun/security/rsa/RSAPadding.java | 50 +-
src/share/classes/sun/security/ssl/Handshaker.java | 88 +--
src/share/classes/sun/security/ssl/RSAClientKeyExchange.java | 151 ++--
src/share/classes/sun/security/tools/JarSigner.java | 107 ++-
src/share/classes/sun/security/tools/JarSignerResources.java | 8 +
src/share/classes/sun/security/util/SecurityConstants.java | 2 +-
src/share/lib/security/java.policy | 69 +-
src/share/lib/security/java.security-linux | 20 +
src/share/lib/security/java.security-macosx | 22 +
src/share/lib/security/java.security-solaris | 23 +-
src/share/lib/security/java.security-windows | 20 +
src/share/native/sun/awt/splashscreen/splashscreen_impl.c | 24 +-
src/share/native/sun/font/layout/AlternateSubstSubtables.cpp | 2 +-
src/share/native/sun/font/layout/AnchorTables.cpp | 44 +-
src/share/native/sun/font/layout/AnchorTables.h | 15 +-
src/share/native/sun/font/layout/ArabicLayoutEngine.cpp | 10 +-
src/share/native/sun/font/layout/ArabicShaping.cpp | 3 +-
src/share/native/sun/font/layout/CanonShaping.cpp | 2 +-
src/share/native/sun/font/layout/CharSubstitutionFilter.h | 4 +-
src/share/native/sun/font/layout/ClassDefinitionTables.h | 2 +
src/share/native/sun/font/layout/ContextualSubstSubtables.cpp | 227 ++++--
src/share/native/sun/font/layout/ContextualSubstSubtables.h | 45 +-
src/share/native/sun/font/layout/CoverageTables.cpp | 30 +-
src/share/native/sun/font/layout/CoverageTables.h | 6 +-
src/share/native/sun/font/layout/CursiveAttachmentSubtables.cpp | 14 +-
src/share/native/sun/font/layout/DeviceTables.cpp | 9 +-
src/share/native/sun/font/layout/DeviceTables.h | 2 +-
src/share/native/sun/font/layout/ExtensionSubtables.cpp | 1 -
src/share/native/sun/font/layout/ExtensionSubtables.h | 3 +-
src/share/native/sun/font/layout/GDEFMarkFilter.cpp | 4 +-
src/share/native/sun/font/layout/GDEFMarkFilter.h | 2 +-
src/share/native/sun/font/layout/GlyphIterator.cpp | 3 +-
src/share/native/sun/font/layout/GlyphIterator.h | 2 +-
src/share/native/sun/font/layout/GlyphPosnLookupProc.cpp | 16 +-
src/share/native/sun/font/layout/GlyphSubstLookupProc.cpp | 4 +-
src/share/native/sun/font/layout/IndicLayoutEngine.cpp | 11 +-
src/share/native/sun/font/layout/KernTable.cpp | 16 +-
src/share/native/sun/font/layout/LEFontInstance.h | 8 +-
src/share/native/sun/font/layout/LEGlyphFilter.h | 2 +-
src/share/native/sun/font/layout/LEGlyphStorage.cpp | 3 +-
src/share/native/sun/font/layout/LEGlyphStorage.h | 1 -
src/share/native/sun/font/layout/LEScripts.h | 13 +-
src/share/native/sun/font/layout/LEStandalone.h | 3 +
src/share/native/sun/font/layout/LETableReference.h | 312 ++++++---
src/share/native/sun/font/layout/LETypes.h | 27 +-
src/share/native/sun/font/layout/LayoutEngine.cpp | 33 +-
src/share/native/sun/font/layout/LayoutEngine.h | 4 +-
src/share/native/sun/font/layout/LigatureSubstSubtables.cpp | 16 +-
src/share/native/sun/font/layout/LookupProcessor.cpp | 22 +-
src/share/native/sun/font/layout/Lookups.cpp | 2 +-
src/share/native/sun/font/layout/MarkArrays.cpp | 20 +-
src/share/native/sun/font/layout/MarkArrays.h | 5 +-
src/share/native/sun/font/layout/MarkToBasePosnSubtables.cpp | 28 +-
src/share/native/sun/font/layout/MarkToLigaturePosnSubtables.cpp | 19 +-
src/share/native/sun/font/layout/MarkToMarkPosnSubtables.cpp | 20 +-
src/share/native/sun/font/layout/MultipleSubstSubtables.cpp | 9 +-
src/share/native/sun/font/layout/OpenTypeLayoutEngine.cpp | 5 +
src/share/native/sun/font/layout/OpenTypeUtilities.h | 5 +-
src/share/native/sun/font/layout/PairPositioningSubtables.cpp | 70 +-
src/share/native/sun/font/layout/PairPositioningSubtables.h | 3 +-
src/share/native/sun/font/layout/ScriptAndLanguage.cpp | 3 +-
src/share/native/sun/font/layout/ScriptAndLanguageTags.cpp | 8 +-
src/share/native/sun/font/layout/ScriptAndLanguageTags.h | 8 +-
src/share/native/sun/font/layout/SegmentArrayProcessor2.cpp | 13 +-
src/share/native/sun/font/layout/SinglePositioningSubtables.cpp | 4 +-
src/share/native/sun/font/layout/SingleSubstitutionSubtables.cpp | 4 +-
src/share/native/sun/font/layout/TibetanReordering.h | 2 +-
src/share/native/sun/font/layout/ValueRecords.cpp | 40 +-
src/share/native/sun/font/layout/ValueRecords.h | 8 +-
src/solaris/classes/sun/nio/ch/SctpChannelImpl.java | 4 +
src/solaris/native/sun/awt/splashscreen/splashscreen_sys.c | 4 +-
test/java/lang/SecurityManager/CheckPackageAccess.java | 1 +
111 files changed, 1813 insertions(+), 1005 deletions(-)
diffs (truncated from 6346 to 500 lines):
diff -r 89bf0c1f4e54 -r 8619fc74e196 make/common/Release.gmk
--- a/make/common/Release.gmk Thu Dec 26 17:49:14 2013 +0000
+++ b/make/common/Release.gmk Wed Oct 16 20:12:52 2013 -0700
@@ -852,10 +852,6 @@
$(BOOT_JAVA_CMD) -jar $(BUILDMETAINDEX_JARFILE) \
-o meta-index *.jar
@$(CD) $(JRE_IMAGE_DIR)/lib/ext && $(java-vm-cleanup)
-ifeq ($(PLATFORM), macosx)
- @#install jobjc, apple mac only
- $(CP) $(OUTPUTDIR)/JObjC.build/JObjC.jar $(JRE_IMAGE_DIR)/lib/JObjC.jar
-endif # macosx
ifeq ($(PLATFORM), windows)
@# Remove certain *.lib files
$(CD) $(JRE_IMAGE_DIR)/lib && \
diff -r 89bf0c1f4e54 -r 8619fc74e196 make/java/Makefile
--- a/make/java/Makefile Thu Dec 26 17:49:14 2013 +0000
+++ b/make/java/Makefile Wed Oct 16 20:12:52 2013 -0700
@@ -57,10 +57,6 @@
SUBDIRS += jexec
endif # PLATFORM
-ifeq ($(PLATFORM), macosx)
- SUBDIRS += jobjc
-endif # PLATFORM
-
include $(BUILDDIR)/common/Subdirs.gmk
all build clean clobber::
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m
--- a/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m Thu Dec 26 17:49:14 2013 +0000
+++ b/src/macosx/native/sun/awt/splashscreen/splashscreen_sys.m Wed Oct 16 20:12:52 2013 -0700
@@ -290,8 +290,8 @@
SplashUnlock(splash);
rc = poll(pfd, 1, timeout);
SplashLock(splash);
- if (splash->isVisible>0 && SplashTime() >= splash->time +
- splash->frames[splash->currentFrame].delay) {
+ if (splash->isVisible > 0 && splash->currentFrame >= 0 &&
+ SplashTime() >= splash->time + splash->frames[splash->currentFrame].delay) {
SplashNextFrame(splash);
SplashRedrawWindow(splash);
}
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/share/classes/com/sun/beans/decoder/DocumentHandler.java
--- a/src/share/classes/com/sun/beans/decoder/DocumentHandler.java Thu Dec 26 17:49:14 2013 +0000
+++ b/src/share/classes/com/sun/beans/decoder/DocumentHandler.java Wed Oct 16 20:12:52 2013 -0700
@@ -29,6 +29,7 @@
import java.beans.ExceptionListener;
import java.io.IOException;
+import java.io.StringReader;
import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
@@ -246,6 +247,14 @@
}
/**
+ * Disables any external entities.
+ */
+ @Override
+ public InputSource resolveEntity(String publicId, String systemId) {
+ return new InputSource(new StringReader(""));
+ }
+
+ /**
* Prepares this handler to read objects from XML document.
*/
@Override
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java
--- a/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java Thu Dec 26 17:49:14 2013 +0000
+++ b/src/share/classes/com/sun/crypto/provider/TlsRsaPremasterSecretGenerator.java Wed Oct 16 20:12:52 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -72,13 +72,17 @@
throw new IllegalStateException(
"TlsRsaPremasterSecretGenerator must be initialized");
}
- if (random == null) {
- random = new SecureRandom();
+ byte[] b = spec.getEncodedSecret();
+ if (b == null) {
+ if (random == null) {
+ random = new SecureRandom();
+ }
+ b = new byte[48];
+ random.nextBytes(b);
+ b[0] = (byte)spec.getMajorVersion();
+ b[1] = (byte)spec.getMinorVersion();
}
- byte[] b = new byte[48];
- random.nextBytes(b);
- b[0] = (byte)spec.getMajorVersion();
- b[1] = (byte)spec.getMinorVersion();
+
return new SecretKeySpec(b, "TlsRsaPremasterSecret");
}
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java
--- a/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java Thu Dec 26 17:49:14 2013 +0000
+++ b/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibEntry.java Wed Oct 16 20:12:52 2013 -0700
@@ -27,17 +27,9 @@
// java imports
//
+import com.sun.jmx.snmp.SnmpDefinitions;
import java.io.Serializable;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-// jmx imports
-//
-import com.sun.jmx.snmp.SnmpValue;
-import com.sun.jmx.snmp.SnmpVarBind;
import com.sun.jmx.snmp.SnmpStatusException;
-import com.sun.jmx.snmp.agent.SnmpMibOid;
-import com.sun.jmx.snmp.agent.SnmpMibNode;
/**
* Represents a node in an SNMP MIB which corresponds to a table entry
@@ -99,7 +91,7 @@
*/
public void validateVarId(long arc, Object userData)
throws SnmpStatusException {
- if (isVariable(arc) == false) throw noSuchNameException;
+ if (isVariable(arc) == false) throw new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName);
}
/**
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java
--- a/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java Thu Dec 26 17:49:14 2013 +0000
+++ b/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibGroup.java Wed Oct 16 20:12:52 2013 -0700
@@ -116,7 +116,7 @@
public void validateVarId(long arc, Object userData)
throws SnmpStatusException {
if (isVariable(arc) == false)
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
}
@@ -365,16 +365,16 @@
// The trailing .0 is missing in the OID
if (depth+2 > length)
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
// There are too many arcs left in the OID (there should remain
// a single trailing .0)
if (depth+2 < length)
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
// The last trailing arc is not .0
if (oid[depth+1] != 0L)
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
// It's one of our variable, register this node.
handlers.add(this,depth,varbind);
@@ -397,7 +397,7 @@
// abort the whole request, so we're going to throw
// a noSuchObject...
//
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
final Object data = handlers.getUserData();
final int pduVersion = handlers.getRequestPduVersion();
@@ -433,7 +433,7 @@
depth+1,handlers,
checker);
}catch(SnmpStatusException ex) {
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
} finally {
checker.remove(depth);
}
@@ -458,7 +458,7 @@
try {
checker.checkCurrentOid();
} catch(SnmpStatusException e) {
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
} finally {
checker.remove(depth,2);
}
@@ -503,7 +503,7 @@
// The oid is not valid, we will throw an exception in order
// to try with the next valid identifier...
//
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
} catch (SnmpStatusException e) {
// We didn't find anything at the given arc, so we're going
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java
--- a/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java Thu Dec 26 17:49:14 2013 +0000
+++ b/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibNode.java Wed Oct 16 20:12:52 2013 -0700
@@ -155,7 +155,7 @@
long[] oid, int depth,
SnmpRequestTree handlers)
throws SnmpStatusException {
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
}
/**
@@ -183,7 +183,7 @@
long[] oid, int pos, int depth,
SnmpRequestTree handlers, AcmChecker checker)
throws SnmpStatusException {
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
}
/**
@@ -347,7 +347,7 @@
final int val= (int) value;
if (a == null)
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
int low= 0;
int max= a.length;
@@ -357,10 +357,10 @@
// Basic check
//
if (max < 1)
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
if (a[max-1] <= val)
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
while (low <= max) {
elmt= a[curr];
@@ -400,15 +400,4 @@
* Contains the list of variable identifiers.
*/
protected int[] varList;
-
- /**
- * Contains a predefined exception that is often fired when an
- * object is not found in the MIB.
- */
- static final protected SnmpStatusException noSuchInstanceException =
- new SnmpStatusException(SnmpStatusException.noSuchInstance);
- static final protected SnmpStatusException noSuchObjectException =
- new SnmpStatusException(SnmpStatusException.noSuchObject);
- static final protected SnmpStatusException noSuchNameException =
- new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName);
}
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java
--- a/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java Thu Dec 26 17:49:14 2013 +0000
+++ b/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibOid.java Wed Oct 16 20:12:52 2013 -0700
@@ -157,11 +157,11 @@
if (depth > length) {
// Nothing is left... the oid is not valid
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
} else if (depth == length) {
// The oid is not complete...
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
} else {
// Some children variable or subobject is being querried
@@ -206,7 +206,7 @@
// abort the whole request, so we're going to throw
// a noSuchObject...
//
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
final Object data = handlers.getUserData();
final int pduVersion = handlers.getRequestPduVersion();
@@ -231,7 +231,7 @@
// SnmpOid result = null;
if (child == null) {
// shouldn't happen
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
// validateVarId(index);
// handlers.add(this,varbind,depth);
// result = new SnmpOid(0);
@@ -442,10 +442,10 @@
//
final int pos= getInsertAt(id);
if (pos >= nbChildren)
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
if (varList[pos] != (int) id)
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
// Access the node
//
@@ -453,10 +453,10 @@
try {
child = children.elementAtNonSync(pos);
} catch(ArrayIndexOutOfBoundsException e) {
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
}
if (child == null)
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
return child;
}
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java
--- a/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java Thu Dec 26 17:49:14 2013 +0000
+++ b/src/share/classes/com/sun/jmx/snmp/agent/SnmpMibTable.java Wed Oct 16 20:12:52 2013 -0700
@@ -279,7 +279,7 @@
SnmpVarBind var = null;
for (Enumeration e= r.getElements(); e.hasMoreElements();) {
var = (SnmpVarBind) e.nextElement();
- r.registerGetException(var,noSuchInstanceException);
+ r.registerGetException(var,new SnmpStatusException(SnmpStatusException.noSuchInstance));
}
}
@@ -1607,7 +1607,7 @@
throws SnmpStatusException {
if (size == 0)
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
final SnmpOid resOid = oid;
@@ -1618,7 +1618,7 @@
if (last.equals(resOid)) {
// Last element of the table ...
//
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
}
// First find the oid. This will allow to speed up retrieval process
@@ -1640,12 +1640,12 @@
// XX last = (SnmpOid) oids.elementAt(newPos);
last = tableoids[newPos];
} catch(ArrayIndexOutOfBoundsException e) {
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
}
} else {
// We are dealing with the last element of the table ..
//
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
}
@@ -1668,7 +1668,7 @@
protected SnmpOid getNextOid(Object userData)
throws SnmpStatusException {
if (size == 0)
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
// XX return (SnmpOid) oids.firstElement();
return tableoids[0];
}
@@ -1875,7 +1875,7 @@
if (!hasEntry) {
if (!handlers.isCreationAllowed())
// we're not doing a set
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
else if (!isCreationEnabled())
// we're doing a set but creation is disabled.
throw new
@@ -1921,7 +1921,7 @@
// abort the whole request, so we're going to throw
// a noSuchObject...
//
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
final Object data = handlers.getUserData();
final int pduVersion = handlers.getRequestPduVersion();
@@ -1955,7 +1955,7 @@
// so we won't find the next element in this table... (any
// element in this table will have a smaller OID)
//
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
} else if (oid[pos] < nodeId) {
// we must return the first leaf under the first columnar
// object, so we are back to our first case where pos was
@@ -2046,7 +2046,7 @@
// must have the same holes)
//
if (skipEntryVariable(entryoid,var,data,pduVersion))
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
} catch(SnmpStatusException se) {
entryoid = getNextOid(data);
var = getNextVarEntryId(entryoid,var,data,pduVersion);
@@ -2079,7 +2079,7 @@
// So we throw the exception.
// => will skip to next node in the MIB tree.
//
- if (entryoid == null || var == -1 ) throw noSuchObjectException;
+ if (entryoid == null || var == -1 ) throw new SnmpStatusException(SnmpStatusException.noSuchObject);
// So here we know both the row (entryoid) and the column (var)
@@ -2092,7 +2092,7 @@
// other entry => skip to next column.
//
if (!isReadableEntryId(entryoid,var,data))
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
// Prepare the result and the ACM checker.
//
@@ -2156,7 +2156,7 @@
// => will skip to next node in the MIB tree.
//
if (entryoid == null || var == -1 )
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
}
}
@@ -2177,12 +2177,12 @@
// Control the length of the oid
//
if (pos +2 >= length)
- throw noSuchInstanceException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchInstance);
// Check that the entry identifier is specified
//
if (oid[pos] != nodeId)
- throw noSuchObjectException;
+ throw new SnmpStatusException(SnmpStatusException.noSuchObject);
}
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java
--- a/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java Thu Dec 26 17:49:14 2013 +0000
+++ b/src/share/classes/com/sun/jmx/snmp/daemon/SnmpRequestHandler.java Wed Oct 16 20:12:52 2013 -0700
@@ -1146,7 +1146,4 @@
static final private String InterruptSysCallMsg =
"Interrupted system call";
-
- static final private SnmpStatusException noSuchNameException =
- new SnmpStatusException(SnmpDefinitions.snmpRspNoSuchName) ;
}
diff -r 89bf0c1f4e54 -r 8619fc74e196 src/share/classes/com/sun/naming/internal/FactoryEnumeration.java
--- a/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java Thu Dec 26 17:49:14 2013 +0000
+++ b/src/share/classes/com/sun/naming/internal/FactoryEnumeration.java Wed Oct 16 20:12:52 2013 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -29,10 +29,10 @@
import javax.naming.NamingException;
/**
- * The FactoryEnumeration is used for returning factory instances.
- *
- * @author Rosanna Lee
- * @author Scott Seligman
+ * The FactoryEnumeration is used for returning factory instances.
+ *
+ * @author Rosanna Lee
+ * @author Scott Seligman
*/
// no need to implement Enumeration since this is only for internal use
@@ -55,9 +55,12 @@
* references so as not to prevent GC of the class loader. Each
* weak reference is tagged with the factory's class name so the
* class can be reloaded if the reference is cleared.
-
+ *
* @param factories A non-null list
* @param loader The class loader of the list's contents
+ *
+ * This internal method is used with Thread Context Class Loader (TCCL),
+ * please don't expose this method as public.
More information about the distro-pkg-dev
mailing list