Hello community,
here is the log from the commit of package java-1_7_0-openjdk for
openSUSE:Factory checked in at 2015-01-26 16:46:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/java-1_7_0-openjdk (Old)
and /work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "java-1_7_0-openjdk"
Changes:
--------
---
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes
2015-01-20 19:12:13.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes
2015-01-26 16:46:45.000000000 +0100
@@ -1,0 +2,326 @@
+Sun Jan 25 17:36:49 UTC 2015 - [email protected]
+
+- Added patch: java-1_7_0-openjdk-giflib5.patch
+ * Fix build with giflib 5.1.x
+
+-------------------------------------------------------------------
+Thu Jan 22 15:59:43 UTC 2015 - [email protected]
+
+- Update to 2.5.4 - OpenJDK 7u75
+ * Security fixes
+ - S8046656: Update protocol support
+ - S8047125, CVE-2015-0395: (ref) More phantom object references
+ - S8047130: Fewer escapes from escape analysis
+ - S8048035, CVE-2015-0400: Ensure proper proxy protocols
+ - S8049253: Better GC validation
+ - S8050807, CVE-2015-0383: Better performing performance data
+ handling
+ - S8054367, CVE-2015-0412: More references for endpoints
+ - S8055304, CVE-2015-0407: More boxing for
+ DirectoryComboBoxModel
+ - S8055309, CVE-2015-0408: RMI needs better transportation
+ considerations
+ - S8055479: TLAB stability
+ - S8055489, CVE-2014-6585: Better substitution formats
+ - S8056264, CVE-2014-6587: Multicast support improvements
+ - S8056276, CVE-2014-6591: Fontmanager feature improvements
+ - S8057555, CVE-2014-6593: Less cryptic cipher suite management
+ - S8058982, CVE-2014-6601: Better verification of an
+ exceptional invokespecial
+ - S8059485, CVE-2015-0410: Resolve parsing ambiguity
+ - S8061210, CVE-2014-3566: Issues in TLS
+ * Backports
+ - S6461635: [TESTBUG] BasicTests.sh test fails intermittently
+ - S6545422: [TESTBUG] NativeErrors.java uses wrong path name in
+ exec
+ - S6653795: C2 intrinsic for Unsafe.getAddress performs pointer
+ sign extension on 32-bit systems
+ - S7028073: The currency symbol for Peru is wrong
+ - S7047033: (smartcardio) Card.disconnect(boolean reset) does
+ not reset when reset is true
+ - S7183753: [TEST] Some colon in the diff for this test
+ - S7077119, PR2165, G534118: remove past transition dates from
+ CurrencyData.properties file
+ - S7085757: Currency Data: ISO 4217 Amendment 152
+ - S7169142: CookieHandler does not work with localhost
+ - S7172012, PR2067: Make test-in-build an option (Queens)
+ - S7185456: (ann) Optimize Annotation handling in
+ java/sun.reflect.* code for small number of annotations
+ - S7195759: ISO 4217 Amendment 154
+ - S8000897, RH1155012: VM crash in CompileBroker
+ - S8001105: findVirtual of Object[].clone produces internal
+ error
+ - S8005232: (JEP-149) Class Instance size reduction
+ - S8006748: getISO3Country() returns wrong value
+ - S8012026: [macosx] Component.getMousePosition() does not
+ work in an applet on MacOS
+ - S8015421: NegativeArraySizeException occurs in
+ ChunkedOutputStream() with Integer.MAX_VALUE
+ - S8020190, PR2160, RH1176718: Fatal: Bug in native code:
+ jfieldID must match object
+ - S8021121: ISO 4217 Amendment Number 156
+ - S8021372: NetworkInterface.getNetworkInterfaces() returns
+ duplicate hardware address
+ - S8022721: TEST_BUG: AnnotationTypeDeadlockTest.java throws
+ java.lang.IllegalStateException: unexpected condition
+ - S8025051: Update resource files for TimeZone display names
+ - S8026792: HOTSPOT: licensee reports a JDK8 build failure
+ after 8005849/8005008 fixes integrated
+ - S8027359: XML parser returns incorrect parsing results
+ - S8028623, PR2112, RH1168693: SA: hash codes in SymbolTable
+ mismatching java_lang_String::hash_code for extended characters
+ - S8028627: Unsynchronized code path from javax.crypto.Cipher to
+ the WeakHashMap used by JceSecurity to store codebase mappings
+ - S8028726: (prefs) Check
+ src/solaris/native/java/util/FileSystemPreferences.c for JNI
+ pending exceptions
+ - S8029153: [TESTBUG] test/compiler/7141637/SpreadNullArg.java
+ fails because it expects NullPointerException
+ - S8031046: Native Windows ccache might still get unsupported
+ ticket
+ - S8031502: JSR292: IncompatibleClassChangeError in LambdaForm
+ for CharSequence.toString() method handle type converter
+ - S8032078: [macosx] CPlatformWindow.setWindowState throws
+ RuntimeException, if windowState=ICONIFIED|MAXIMIZED_BOTH
+ - S8032669: Mouse release not being delivered to Swing component
+ in 7u45
+ - S8032788: ImageIcon constructor throws an NPE and hangs when
+ passed a null String parameter
+ - S8032909: XSLT string-length returns incorrect length when
+ string includes complementary chars
+ - S8034200: Test java/net/CookieHandler/LocalHostCookie.java
+ fails after fix of JDK-7169142
+ - S8036863: Update jdk7 testlibrary to match jdk8 in hotspot
+ - S8040168: Set hotspot version to hs24.66 and build to b01 for
+ 7u66
+ - S8040617: [macosx] Large JTable cell results in a
+ OutOfMemoryException
+ - S8041132: Increment hsx 24.66 build to b02 for 7u66-b09
+ - S8041408: Increment hsx 24.55 build to b04 for 7u55-b34
+ - S8041572: [macosx] huge native memory leak in AWTWindow.m
+ - S8041990: [macosx] Language specific keys does not work in
+ applets when opened outside the browser
+ - S8043610: Sorting columns in JFileChooser fails with
+ AppContext NPE
+ - S8044603: Increment minor version of HSx for 7u71 and
+ initialize the build number
+ - S8046343: (smartcardio) CardTerminal.connect('direct') does
+ not work on MacOSX
+ - S8049250: Need a flag to invert the Card.disconnect(reset)
+ argument
+ - S8049343: (tz) Support tzdata2014g
+ - S8049758: Increment minor version of HSx for 7u75 and
+ initialize the build number
+ - S8050485: super() in a try block in a ctor causes VerifyError
+ - S8051359: JPopupMenu creation in headless mode with JDK9b23
+ causes NPE
+ - S8051614: smartcardio TCK tests fail due to lack of 'reset'
+ permission
+ - S8055222: Currency update needed for ISO 4217 Amendment #159
+ - S8056211:
api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002]
+ failure
+ - S8057184: JCK8's api/javax_swing/JDesktopPane/descriptions.html#getset
+ failed with GTKLookAndFeel on Linux and Solaris
+ - S8058715: stability issues when being launched as an embedded
+ JVM via JNI
+ - S8059206: (tz) Support tzdata2014i
+ - S8060474: Resolve more parsing ambiguity
+ - S8061685: Increment hsx 24.75 build to b02 for 7u75-b06
+ - S8061785: [TEST_BUG] serviceability/sa/jmap-hashcode/Test8028623.java
+ has utf8 character corrupted by earlier merge
+ - S8061826: Part of JDK-8060474 should be reverted
+ - S8062561: Test bug8055304 fails if file system default
+ directory has read access
+ - S8062807: Exporting RMI objects fails when run under
+ restrictive SecurityManager
+ - S8064300: Increment hsx 24.75 build to b03 for 7u75-b06
+ - S8064560: (tz) Support tzdata2014j
+ - S8065608: 7u75 l10n resource file translation update
+ - S8065787: Increment hsx 24.75 build to b04 for 7u75-b10
+ - S8066747: Backing out Japanese translation change in
+ awt_ja.properties
+ - S8067364, PR2145, RH114622: Printing to Postscript doesn't
+ support dieresis
+ * Bug fixes
+ - PR2064: Unset OS before running OpenJDK build
+ - PR2069: Type-punning warnings still evident on RHEL 5
+ - PR2094, RH1163501: 2048-bit DH upper bound too small for
+ Fedora infrastructure
+ - PR2123: SunEC provider crashes when built using system NSS
+ - PR2124: Synchronise elliptic curves in
+ sun.security.ec.NamedCurve with those listed by NSS
+ - PR2135: Race condition in SunEC provider with system NSS
+ - PR2161: RHEL 6 has a version of GIO which meets the version
+ criteria, but has no g_settings_*
+ * CACAO
+ - PR2032: CACAO lacks JVM_FindClassFromCaller introduced by
+ security patch in 2.5.3
+ * JamVM
+ - PR2050: JamVM lacks JVM_FindClassFromCaller introduced by
+ security patch in 2.5.3
+ - PR2171: JamVM builds with executable stack, causing failures
+ on SELinux & PaX kernels
+ * AArch64 port
+ - Use the IcedTea7 fork version rather than the one based on
+ HotSpot 25
+ - Add arch-specific processing of tmp1 register needed for d/f2i
+ - Add char_array_equals intrinsic
+ - Add CNEG and CNEGW to macro assembler
+ - Add frame anchor fences
+ - Add missing instruction synchronization barriers and cache
+ flushes
+ - Add some memory barriers for object creation and runtime
+ calls
+ - Add support for A53 multiply accumulate
+ - Add support for AES Intrinsics
+ - Add support for pipeline scheduling
+ - Add support for String.indexOf intrinsic
+ - Added make rules to allow aarch64-x86 hybrid build to progress
+ - Added missing aarch64-specific include
+ - Added missing aarch64-specific make file
+ - Added missing changes for debug code
+ - Added missing inline method
+ - Added missing shared global UseCRC32Intrinsics
+ - Added pd global UseVectoredExceptions
+ - Add local method to redirect to AbstractAssembler::relocate
+ - Add missing declarations for CRC32 methods
+ - Add missing include
+ - Add missing special case code for aarch64
+ - Add rules to assemble .S files
+ - Add support for storing aarch64 call format
+ - Add wrapper method to avoid dependency on not yet defined
+ code buffer class
+ - Added missing endif
+ - Allow for 0x400 aligned offsets for byte_map_base
+ - Array load must only read 32 bits
+ - A more efficient sequence for C1_MacroAssembler::float_cmp
+ - Backout 8c8b5e62e624 and instead move .S rule from
++++ 129 more lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/java-1_7_0-openjdk-bootstrap.changes
++++ and
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/java-1_7_0-openjdk-bootstrap.changes
java-1_7_0-openjdk.changes: same change
Old:
----
7085757-currency_fix.patch
icedtea-2.5.3.tar.xz
icedtea-2.5.3.tar.xz.sig
New:
----
icedtea-2.5.4.tar.xz
icedtea-2.5.4.tar.xz.sig
java-1_7_0-openjdk-giflib5.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ java-1_7_0-openjdk-bootstrap.spec ++++++
--- /var/tmp/diff_new_pack.jvJLIa/_old 2015-01-26 16:46:49.000000000 +0100
+++ /var/tmp/diff_new_pack.jvJLIa/_new 2015-01-26 16:46:49.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package java-1_7_0-openjdk-bootstrap
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%global jit_arches %ix86 x86_64 ppc64 ppc64le
%global test_arches %ix86 x86_64 ppc64 ppc64le
-%global icedtea_version 2.5.3
+%global icedtea_version 2.5.4
%global icedtea_sound_version 1.0.1
%global mauvedate 2008-10-22
%global buildoutputdir openjdk.build/
@@ -31,7 +31,7 @@
# Standard JPackage naming and versioning defines.
%global priority 17147
%global javaver 1.7.0
-%global buildver 71
+%global buildver 75
# Standard JPackage directories and symbolic links.
%global sdklnk java-%{javaver}-openjdk
%global archname %{sdklnk}
@@ -163,6 +163,8 @@
#
# OpenJDK specific patches
#
+# Fix build with giflib5
+Patch105: java-1_7_0-openjdk-giflib5.patch
Patch106: java-1.7.0-openjdk-freetype-check-fix.patch
# Fix use of unintialized memory in adlc parser
Patch107: java-1.7.0-openjdk-adlc-parser.patch
@@ -186,8 +188,6 @@
# Avoid too much silence from javadoc
Patch1005: java-1_7_0-openjdk-javadoc-verbose.patch
Patch1006: java-1_7_0-openjdk-override.patch
-# PATCH-FIX-UPSTREAM java-1_7_0-openjdk-currency_fix_icedtea7.patch
[email protected] -- Allow to build after 31.12.2014 (icedtea fix)
-Patch1007: 7085757-currency_fix.patch
Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch
BuildRequires: alsa-lib-devel
#BuildRequires: xalan-j2
@@ -483,7 +483,6 @@
%patch1000 -p1
%patch1003 -p1
-%patch1007 -p1
%build
export LANG=C
@@ -583,6 +582,7 @@
%endif
%endif
+patch -p0 -i %{PATCH105}
patch -p0 -i %{PATCH107}
patch -p0 -R -i %{PATCH404}
++++++ java-1_7_0-openjdk.spec ++++++
--- /var/tmp/diff_new_pack.jvJLIa/_old 2015-01-26 16:46:49.000000000 +0100
+++ /var/tmp/diff_new_pack.jvJLIa/_new 2015-01-26 16:46:49.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package java-1_7_0-openjdk
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%{!?aarch64:%global aarch64 aarch64 arm64 armv8}
%global jit_arches %ix86 x86_64 ppc64 ppc64le
%global test_arches %ix86 x86_64 ppc64 ppc64le
-%global icedtea_version 2.5.3
+%global icedtea_version 2.5.4
%global icedtea_sound_version 1.0.1
%global mauvedate 2008-10-22
%global buildoutputdir openjdk.build/
@@ -31,7 +31,7 @@
# Standard JPackage naming and versioning defines.
%global priority 17147
%global javaver 1.7.0
-%global buildver 71
+%global buildver 75
# Standard JPackage directories and symbolic links.
%global sdklnk java-%{javaver}-openjdk
%global archname %{sdklnk}
@@ -163,6 +163,8 @@
#
# OpenJDK specific patches
#
+# Fix build with giflib5
+Patch105: java-1_7_0-openjdk-giflib5.patch
Patch106: java-1.7.0-openjdk-freetype-check-fix.patch
# Fix use of unintialized memory in adlc parser
Patch107: java-1.7.0-openjdk-adlc-parser.patch
@@ -186,8 +188,6 @@
# Avoid too much silence from javadoc
Patch1005: java-1_7_0-openjdk-javadoc-verbose.patch
Patch1006: java-1_7_0-openjdk-override.patch
-# PATCH-FIX-UPSTREAM java-1_7_0-openjdk-currency_fix_icedtea7.patch
[email protected] -- Allow to build after 31.12.2014 (icedtea fix)
-Patch1007: 7085757-currency_fix.patch
Patch10011: openjdk-7-src-b147-no-return-in-nonvoid-hotspot.patch
BuildRequires: alsa-lib-devel
#BuildRequires: xalan-j2
@@ -483,7 +483,6 @@
%patch1000 -p1
%patch1003 -p1
-%patch1007 -p1
%build
export LANG=C
@@ -583,6 +582,7 @@
%endif
%endif
+patch -p0 -i %{PATCH105}
patch -p0 -i %{PATCH107}
patch -p0 -R -i %{PATCH404}
++++++ aarch64.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/aarch64.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/aarch64.tar.bz2 differ: char
11, line 1
++++++ corba.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/corba-4aed5efcd8df/.hgtags
new/corba-3c9f523bf96e/.hgtags
--- old/corba-4aed5efcd8df/.hgtags 2014-08-18 19:20:52.000000000 +0200
+++ new/corba-3c9f523bf96e/.hgtags 2015-01-06 20:04:18.000000000 +0100
@@ -437,6 +437,9 @@
55ff6957449cf6c79f5d5bb159df27f51ece1659 jdk7u55-b31
fba15e177b15873e3c63b0efc7c0f5647a243a79 jdk7u55-b32
6503115cbedda9216083fc1798e2fa5a2775f68a jdk7u55-b33
+c8614d56bc1c5c60431f938a0c33d8fc42e7aef0 jdk7u55-b34
+be587f9142bcb694b647642fbbb05dbaa7b1b1b3 jdk7u55-b35
+05ea23fd127a217965eb304932e8c0ce5933f04b jdk7u55-b36
c5b5886004e6446b8b27ccdc1fd073354c1dc614 jdk7u60-b00
a531112cc6d0b0a1e7d4ffdaa3ba53addcd25cf4 jdk7u60-b01
d81370c5b863acc19e8fb07315b1ec687ac1136a jdk7u60-b02
@@ -468,6 +471,10 @@
03a1bf9a9e898228db9660cc5821a561bbd4108e icedtea-2.5pre07
32c25f3ecdf67b82678b35cadc1a10fb63b312f3 icedtea-2.5pre08
32c25f3ecdf67b82678b35cadc1a10fb63b312f3 icedtea-2.5.0
+39734d26e279098fae06cee5a127e126090ddec9 jdk7u60-b30
+8939f268abb8c153de653f2659fff6716e5f83f8 jdk7u60-b31
+9665790000e22370daefddbf56dd81e89e07b7c4 jdk7u60-b32
+437b4b2aed4811af16efcafca7995684493d205b jdk7u60-b33
6a89d959cbade46fcd281f421ac40a804d098f0b jdk7u65-b02
afed3d62e8051fe65f431abe87dad50cbeba3800 jdk7u65-b03
38fabf72970ae509350f57ffad99f6ac8fc6fdad jdk7u65-b04
@@ -491,3 +498,38 @@
06663e4cfbbeade300222eeae55856940b2ffbee icedtea-2.5.2
1d178f96bc11a65290eb4787edbca3c08c83a4f4 icedtea-2.5.3pre01
090fc686cf0b453298269f96ae04fa8f35a42d7f icedtea-2.5.3pre02
+4aed5efcd8df5f5d8aaf771d75dadfebbf89cf10 icedtea-2.5.3
+dae3f20d2306622e39606d0dc967147de174afce jdk7u65-b32
+ac05dfedf008e83c2044666a70635cf82e932e41 jdk7u65-b20
+244756837ab4b214decd0e6f26b0071a483f143f jdk7u67-b01
+50ddba8882e7e95150418a30bfc3ee62e3c28c6c jdk7u65-b40
+d2f7358b01d3d8b877b2ec2ca2989bd1daf17472 jdk7u65-b31
+2067d7202adcedb80fa676dacb22a0b73d5e8548 jdk7u65-b33
+5b8210c41bc41135687028bcb000ca116e2090f6 jdk7u66-b00
+9f0f0bdd4cfb01a5d64f9528b7ffda3974171120 jdk7u66-b01
+596d979a5d4deb9d10b068479276cd4b2a12432e jdk7u66-b09
+fec514d46b860920690707e9d0538ad76ca3f886 jdk7u66-b10
+09655f16930ece8e7a8342f335726fe9ea327812 jdk7u66-b11
+dca36b02c6e10fa303023a62f51ea4bf0497ae94 jdk7u66-b12
+d0d039a1eca081bc05e833dfc027df1aa1bd018a jdk7u66-b13
+1e46e65dd58db00180f1ccaaae93ae7946b22d29 jdk7u66-b14
+f2c867d52b393e661216057f0b559ef3fd122530 jdk7u66-b15
+3039f266eef2ba54ec2869d87adac6e395c82fe9 jdk7u66-b16
+0b46b93a61966e8d2332f1d3899d7c858a653d91 jdk7u66-b17
+fd1c9030a08d513b5a477f82a46855bb6a9cacac jdk7u71-b00
+50e4090a8583a88875ab7323fc2e5b6ba2f1de7f jdk7u71-b01
+5bd7482913f6a498c2b2b6c80478b2af93dee805 jdk7u71-b02
+557d335eb4a358ffe7a8114685f11831da5d4510 jdk7u71-b03
+ccf59458d69f7fd0d6b119ee1ef16a2b131f84b8 jdk7u71-b04
+92d099fedc269d61dd10bba0f79a224c1bf40c25 jdk7u71-b05
+19de752151f6abfb477c72a92e59993a6c3c3f99 jdk7u71-b06
+36d628e53ebf7f6251395e6eb409239b473a7f16 jdk7u71-b07
+2fdf855f6d9fe27bcf102e64c120375f331ee75d jdk7u71-b08
+1655475001d914bc105959d94c24e0671591e845 jdk7u71-b09
+9508dd229246b82201fb7075ebfe2c913f89a196 jdk7u71-b10
+3e804dc3cea9ff145f375a50a161f3e173e8d3f6 jdk7u71-b11
+cc3072067ae8ac685d400ced4c0f144d6a1d9f1e jdk7u71-b12
+1616089899e25679d6cf70c77023f2a37ff85ad1 jdk7u71-b13
+3b13d5123ab280705c27c9e025fd6ecca8a09f58 icedtea-2.5.4pre01
+946d8c68cc64055e0a7bcbceecb499e193328c2c icedtea-2.5.4pre02
+b894abb26bbf730bf048809e61647886a05235c2 icedtea-2.5.4pre03
++++++ hotspot.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/hotspot.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/hotspot.tar.bz2 differ: char
11, line 1
++++++ icedtea-2.5.3.tar.xz -> icedtea-2.5.4.tar.xz ++++++
++++ 8135 lines of diff (skipped)
++++++ java-1_7_0-openjdk-giflib5.patch ++++++
--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
2015-01-25 18:14:36.325102239 +0100
+++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
2015-01-25 18:19:24.863429439 +0100
@@ -310,7 +310,14 @@
free(pBitmapBits);
free(pOldBitmapBits);
+#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
+ int error = 0;
+ DGifCloseFile(gif, &error);
+ if (error)
+ return 0;
+#else
DGifCloseFile(gif);
+#endif
return 1;
}
++++++ jaxp.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxp-c903902aadd7/.hgtags
new/jaxp-ca26767d3375/.hgtags
--- old/jaxp-c903902aadd7/.hgtags 2014-05-12 23:18:02.000000000 +0200
+++ new/jaxp-ca26767d3375/.hgtags 2015-01-06 20:04:19.000000000 +0100
@@ -438,6 +438,9 @@
5be97f6c25d9eb3ef0a05fc860964cb3d27134b0 jdk7u55-b31
94f3ad704f28d5ec65f7a3b1cbf5cfe7e42151f3 jdk7u55-b32
476aad2c130e2b1b7033fa6789754c03151da95c jdk7u55-b33
+32aa4a5892b0567b19da2bc5b72aa3f3a3398130 jdk7u55-b34
+1f8449a6e05ee0a495ba89c3b4021b46f641ff40 jdk7u55-b35
+7767e8740aea3283703e634ffdbfccd0fbebe82d jdk7u55-b36
d9b92749a0f4c8e6c6f4fe11210c2a02d70bae74 jdk7u60-b00
ad39e88c503948fc4fc01e97c75b6e3c24599d23 jdk7u60-b01
050986fd54e3ec4515032ee938bc59e86772b6c0 jdk7u60-b02
@@ -469,6 +472,10 @@
f4ad8e860eaf9cb6352e08ea88922d8c41fce766 icedtea-2.5pre07
6b28d9218dac6b1ebb849fad37fd3d29f08accfc icedtea-2.5pre08
6b28d9218dac6b1ebb849fad37fd3d29f08accfc icedtea-2.5.0
+cef2dec8b5d76555c5b7b2e1a62275206f76a07a jdk7u60-b30
+bfa8403a1e28bdc1e94ba61d89e170e4ccc7d58b jdk7u60-b31
+33a8a292a02aa76139d0d04970a0d87cc674f2e3 jdk7u60-b32
+583c5eeb9f31275121aecca60307b8885a1a80d0 jdk7u60-b33
27909f138bdb9ffdd2ab4bded231c7ccc2264046 jdk7u65-b02
b3307181bd0f1a2c6e1e2c403b87a76e34452110 jdk7u65-b03
efa9425faaf402b7ea9c6226eb08236d8fa1ff2b jdk7u65-b04
@@ -492,3 +499,38 @@
d77720c6a36f0b9c995e47badb8efddd0e8f2021 icedtea-2.5.2
771d2a0e90aef31fd70a2eda48b2d1aff8c15101 icedtea-2.5.3pre01
a4e4e763970f6ac7f39892491cfcde2f6e182a1e icedtea-2.5.3pre02
+c903902aadd72d7fdc9bd7904c30eb3a1c6129c1 icedtea-2.5.3
+f3b7bb6f1924ab7f635cdd60db7fbab64576cd6d jdk7u65-b32
+d41f31b707c87675f3467e980b1ceef2e53b3b5d jdk7u65-b20
+d1f8566d39c56e40516a1afb304ed7c0681355d8 jdk7u67-b01
+4e323af07c47061109fb5f585613b0cc4b4208ca jdk7u65-b40
+a5f829d7fa05cf769402dfc82c94b737b8d011b0 jdk7u65-b31
+f33ea72260ca7480f4a1405d35a3709895b491a2 jdk7u65-b33
+86e93799766d67102a37559b3831abcc825d7e24 jdk7u66-b00
+d34839cb2f15dee01cdfb1fd93378849de34d662 jdk7u66-b01
+19e4e978c8212921104ba16d0db6bf18c6f8d0ab jdk7u66-b09
+533ecae83034da1e68ee9a414b690c9b6eead293 jdk7u66-b10
+763f80d4aae130a89efa4c6544ee98fcb7e6a2ca jdk7u66-b11
+0d91d2f038d19261e0085a76bb8974c3b7609c5d jdk7u66-b12
+cddc3774bebfe597228c7b3e386859b1fa775387 jdk7u66-b13
+15206a7046a97d0a0fd824bec8b0e4174a56d8eb jdk7u66-b14
+af60b8e3b9deb32d50552916e0afd38a30feaef0 jdk7u66-b15
+36bba6c72f866df5c65ba8678544bf0442a952b3 jdk7u66-b16
+9a777cc0d6b3b25d13feca1e610584d042565367 jdk7u66-b17
+174a2f822f4f600f798e9963f0c1496206dce471 jdk7u71-b00
+df8d93eddfc2de1046b8fb87204bc945c538a282 jdk7u71-b01
+153724c929075f0a741aacead679af39f03a0a80 jdk7u71-b02
+9e2007e23f356b7bc5d4d0c6c6350e9b3b3cd56b jdk7u71-b03
+f58a7f8db6c54cd76621d1f48d17102ffbe93983 jdk7u71-b04
+edab7f6d9a30feea45bf9185de0c65e11ab3a7b0 jdk7u71-b05
+ca2992ad734eaf8295e21351b0de329555e9e60a jdk7u71-b06
+5fbecd4c30c2e566e9b815818d51042e20d3ab83 jdk7u71-b07
+acf176ea76f904674228745c25af195e460f1240 jdk7u71-b08
+8a9f55d8d011ad6dc36f307dfac47981b676b379 jdk7u71-b09
+d82fd2f6c5c8ed03c75828033058b675f9239d4b jdk7u71-b10
+f7542072016b7972b383075f84df29bc05495d2e jdk7u71-b11
+109dd4c4a07a8adfaf59e11c29e502277b803c44 jdk7u71-b12
+df2c7c9a3609f8f4b30b09c29a9cfddc8b4b90ef jdk7u71-b13
+d5fcf3403d56ec90868f44e6a07e14f9628e1132 icedtea-2.5.4pre01
+bd7f82f68cf1733bc70f3b8eaf0a618b87d16171 icedtea-2.5.4pre02
+95795ef2016e32978b6cf76d52942d4c3f9a7fed icedtea-2.5.4pre03
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-c903902aadd7/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
new/jaxp-ca26767d3375/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
---
old/jaxp-c903902aadd7/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
2014-05-12 23:18:02.000000000 +0200
+++
new/jaxp-ca26767d3375/src/com/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java
2015-01-06 20:04:19.000000000 +0100
@@ -26,7 +26,7 @@
import java.util.Vector;
import com.sun.org.apache.bcel.internal.generic.ConstantPoolGen;
-import com.sun.org.apache.bcel.internal.generic.INVOKEVIRTUAL;
+import com.sun.org.apache.bcel.internal.generic.INVOKESTATIC;
import com.sun.org.apache.bcel.internal.generic.InstructionList;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ClassGenerator;
import com.sun.org.apache.xalan.internal.xsltc.compiler.util.MethodGenerator;
@@ -51,7 +51,8 @@
il.append(methodGen.loadContextNode());
Type.Node.translateTo(classGen, methodGen, Type.String);
}
- il.append(new INVOKEVIRTUAL(cpg.addMethodref(STRING_CLASS,
- "length", "()I")));
+ il.append(new INVOKESTATIC(cpg.addMethodref(BASIS_LIBRARY_CLASS,
+ "getStringLength",
+
"(Ljava/lang/String;)I")));
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-c903902aadd7/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
new/jaxp-ca26767d3375/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
---
old/jaxp-c903902aadd7/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
2014-05-12 23:18:02.000000000 +0200
+++
new/jaxp-ca26767d3375/src/com/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java
2015-01-06 20:04:19.000000000 +0100
@@ -1660,5 +1660,14 @@
}
+ /**
+ * Utility method to calculate string-length as a number of code points,
+ * to avoid possible errors with string that contains
+ * complementary characters
+ */
+ public static int getStringLength(String str) {
+ return str.codePointCount(0,str.length());
+ }
+
//-- End utility functions
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-c903902aadd7/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
new/jaxp-ca26767d3375/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
---
old/jaxp-c903902aadd7/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
2014-05-12 23:18:02.000000000 +0200
+++
new/jaxp-ca26767d3375/src/com/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java
2015-01-06 20:04:19.000000000 +0100
@@ -61,14 +61,13 @@
package com.sun.org.apache.xerces.internal.impl;
-import java.io.IOException;
-
import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
-import com.sun.org.apache.xerces.internal.util.XMLChar;
import com.sun.org.apache.xerces.internal.util.XML11Char;
+import com.sun.org.apache.xerces.internal.util.XMLChar;
import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
import com.sun.org.apache.xerces.internal.xni.QName;
import com.sun.org.apache.xerces.internal.xni.XMLString;
+import java.io.IOException;
/**
* Implements the entity scanner methods in
@@ -78,6 +77,7 @@
*
* @author Michael Glavassevich, IBM
* @author Neil Graham, IBM
+ * @version $Id: XML11EntityScanner.java,v 1.5 2010-11-01 04:39:40 joehw Exp $
*/
public class XML11EntityScanner
@@ -108,7 +108,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
// peek at character
@@ -136,7 +136,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
// scan character
@@ -148,7 +148,7 @@
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count) {
fCurrentEntity.ch[0] = (char)c;
- load(1, false);
+ load(1, false, true);
}
if (c == '\r' && external) {
int cc = fCurrentEntity.ch[fCurrentEntity.position++];
@@ -183,7 +183,7 @@
public String scanNmtoken() throws IOException {
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
// scan nmtoken
@@ -194,6 +194,7 @@
if (XML11Char.isXML11Name(ch)) {
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -206,7 +207,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -214,6 +215,7 @@
else if (XML11Char.isXML11NameHighSurrogate(ch)) {
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -226,7 +228,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
--fCurrentEntity.startPosition;
--fCurrentEntity.position;
break;
@@ -240,6 +242,7 @@
}
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -252,7 +255,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -294,7 +297,7 @@
public String scanName() throws IOException {
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
// scan name
@@ -305,7 +308,7 @@
if (++fCurrentEntity.position == fCurrentEntity.count) {
fCurrentEntity.ch[0] = ch;
offset = 0;
- if (load(1, false)) {
+ if (load(1, false, true)) {
fCurrentEntity.columnNumber++;
String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch,
0, 1);
return symbol;
@@ -316,7 +319,7 @@
if (++fCurrentEntity.position == fCurrentEntity.count) {
fCurrentEntity.ch[0] = ch;
offset = 0;
- if (load(1, false)) {
+ if (load(1, false, true)) {
--fCurrentEntity.position;
--fCurrentEntity.startPosition;
return null;
@@ -332,7 +335,7 @@
fCurrentEntity.ch[0] = ch;
fCurrentEntity.ch[1] = ch2;
offset = 0;
- if (load(2, false)) {
+ if (load(2, false, true)) {
fCurrentEntity.columnNumber += 2;
String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch,
0, 2);
return symbol;
@@ -348,6 +351,7 @@
if (XML11Char.isXML11Name(ch)) {
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -360,7 +364,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -368,6 +372,7 @@
else if (XML11Char.isXML11NameHighSurrogate(ch)) {
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -380,7 +385,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
--fCurrentEntity.position;
--fCurrentEntity.startPosition;
break;
@@ -394,6 +399,7 @@
}
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -406,7 +412,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -449,7 +455,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
// scan name
@@ -460,7 +466,7 @@
if (++fCurrentEntity.position == fCurrentEntity.count) {
fCurrentEntity.ch[0] = ch;
offset = 0;
- if (load(1, false)) {
+ if (load(1, false, true)) {
fCurrentEntity.columnNumber++;
String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch,
0, 1);
return symbol;
@@ -471,7 +477,7 @@
if (++fCurrentEntity.position == fCurrentEntity.count) {
fCurrentEntity.ch[0] = ch;
offset = 0;
- if (load(1, false)) {
+ if (load(1, false, true)) {
--fCurrentEntity.position;
--fCurrentEntity.startPosition;
return null;
@@ -487,7 +493,7 @@
fCurrentEntity.ch[0] = ch;
fCurrentEntity.ch[1] = ch2;
offset = 0;
- if (load(2, false)) {
+ if (load(2, false, true)) {
fCurrentEntity.columnNumber += 2;
String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch,
0, 2);
return symbol;
@@ -503,6 +509,7 @@
if (XML11Char.isXML11NCName(ch)) {
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -515,7 +522,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -523,6 +530,7 @@
else if (XML11Char.isXML11NameHighSurrogate(ch)) {
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -535,7 +543,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
--fCurrentEntity.startPosition;
--fCurrentEntity.position;
break;
@@ -549,6 +557,7 @@
}
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -561,7 +570,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -610,7 +619,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
// scan qualified name
@@ -621,7 +630,7 @@
if (++fCurrentEntity.position == fCurrentEntity.count) {
fCurrentEntity.ch[0] = ch;
offset = 0;
- if (load(1, false)) {
+ if (load(1, false, true)) {
fCurrentEntity.columnNumber++;
String name = fSymbolTable.addSymbol(fCurrentEntity.ch, 0,
1);
qname.setValues(null, name, name, null);
@@ -633,7 +642,7 @@
if (++fCurrentEntity.position == fCurrentEntity.count) {
fCurrentEntity.ch[0] = ch;
offset = 0;
- if (load(1, false)) {
+ if (load(1, false, true)) {
--fCurrentEntity.startPosition;
--fCurrentEntity.position;
return false;
@@ -649,7 +658,7 @@
fCurrentEntity.ch[0] = ch;
fCurrentEntity.ch[1] = ch2;
offset = 0;
- if (load(2, false)) {
+ if (load(2, false, true)) {
fCurrentEntity.columnNumber += 2;
String name = fSymbolTable.addSymbol(fCurrentEntity.ch, 0,
2);
qname.setValues(null, name, name, null);
@@ -674,6 +683,7 @@
}
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -689,7 +699,7 @@
index = index - offset;
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -697,6 +707,7 @@
else if (XML11Char.isXML11NameHighSurrogate(ch)) {
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -712,7 +723,7 @@
index = index - offset;
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
sawIncompleteSurrogatePair = true;
--fCurrentEntity.startPosition;
--fCurrentEntity.position;
@@ -728,6 +739,7 @@
}
if (++fCurrentEntity.position == fCurrentEntity.count) {
int length = fCurrentEntity.position - offset;
+ invokeListeners(length);
if (length == fCurrentEntity.ch.length) {
// bad luck we have to resize our buffer
char[] tmp = new char[fCurrentEntity.ch.length << 1];
@@ -743,7 +755,7 @@
index = index - offset;
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -820,11 +832,11 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
- load(1, false);
+ load(1, false, true);
fCurrentEntity.position = 0;
fCurrentEntity.startPosition = 0;
}
@@ -846,7 +858,7 @@
fCurrentEntity.baseCharOffset +=
(fCurrentEntity.position - fCurrentEntity.startPosition);
fCurrentEntity.position = newlines;
fCurrentEntity.startPosition = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -869,7 +881,7 @@
fCurrentEntity.baseCharOffset +=
(fCurrentEntity.position - fCurrentEntity.startPosition);
fCurrentEntity.position = newlines;
fCurrentEntity.startPosition = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -961,11 +973,11 @@
throws IOException {
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
- load(1, false);
+ load(1, false, true);
fCurrentEntity.startPosition = 0;
fCurrentEntity.position = 0;
}
@@ -987,7 +999,7 @@
fCurrentEntity.baseCharOffset +=
(fCurrentEntity.position - fCurrentEntity.startPosition);
fCurrentEntity.position = newlines;
fCurrentEntity.startPosition = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -1010,7 +1022,7 @@
fCurrentEntity.baseCharOffset +=
(fCurrentEntity.position - fCurrentEntity.startPosition);
fCurrentEntity.position = newlines;
fCurrentEntity.startPosition = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -1113,7 +1125,7 @@
do {
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, false);
}
boolean bNextEntity = false;
@@ -1127,7 +1139,7 @@
0,
fCurrentEntity.count - fCurrentEntity.position);
- bNextEntity = load(fCurrentEntity.count -
fCurrentEntity.position, false);
+ bNextEntity = load(fCurrentEntity.count -
fCurrentEntity.position, false, false);
fCurrentEntity.position = 0;
fCurrentEntity.startPosition = 0;
}
@@ -1140,7 +1152,7 @@
fCurrentEntity.baseCharOffset += (fCurrentEntity.position -
fCurrentEntity.startPosition);
fCurrentEntity.position = fCurrentEntity.count;
fCurrentEntity.startPosition = fCurrentEntity.count;
- load(0,true);
+ load(0,true, false);
return false;
}
@@ -1160,7 +1172,7 @@
fCurrentEntity.baseCharOffset +=
(fCurrentEntity.position - fCurrentEntity.startPosition);
fCurrentEntity.position = newlines;
fCurrentEntity.startPosition = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -1184,7 +1196,7 @@
fCurrentEntity.position = newlines;
fCurrentEntity.startPosition = newlines;
fCurrentEntity.count = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -1309,7 +1321,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
// skip character
@@ -1335,7 +1347,7 @@
// handle newlines
if (fCurrentEntity.position == fCurrentEntity.count) {
fCurrentEntity.ch[0] = (char)cc;
- load(1, false);
+ load(1, false, true);
}
int ccc = fCurrentEntity.ch[++fCurrentEntity.position];
if (ccc == '\n' || ccc == 0x85) {
@@ -1369,7 +1381,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
@@ -1397,7 +1409,7 @@
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count -
1) {
fCurrentEntity.ch[0] = (char)c;
- entityChanged = load(1, true);
+ entityChanged = load(1, true, true);
if (!entityChanged) {
// the load change the position to be 1,
// need to restore it when entity not changed
@@ -1424,7 +1436,7 @@
if (!entityChanged)
fCurrentEntity.position++;
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
if(fCurrentEntity == null){
return true ;
@@ -1445,7 +1457,7 @@
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count - 1) {
fCurrentEntity.ch[0] = (char)c;
- entityChanged = load(1, true);
+ entityChanged = load(1, true, true);
if (!entityChanged) {
// the load change the position to be 1,
// need to restore it when entity not changed
@@ -1463,7 +1475,7 @@
if (!entityChanged)
fCurrentEntity.position++;
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
if(fCurrentEntity == null){
return true ;
@@ -1496,7 +1508,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, true);
}
// skip string
@@ -1508,10 +1520,11 @@
return false;
}
if (i < length - 1 && fCurrentEntity.position ==
fCurrentEntity.count) {
+ invokeListeners(0);
System.arraycopy(fCurrentEntity.ch, fCurrentEntity.count - i -
1, fCurrentEntity.ch, 0, i + 1);
// REVISIT: Can a string to be skipped cross an
// entity boundary? -Ac
- if (load(i + 1, false)) {
+ if (load(i + 1, false, false)) {
fCurrentEntity.startPosition -= i + 1;
fCurrentEntity.position -= i + 1;
return false;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxp-c903902aadd7/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
new/jaxp-ca26767d3375/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
---
old/jaxp-c903902aadd7/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
2014-05-12 23:18:02.000000000 +0200
+++
new/jaxp-ca26767d3375/src/com/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java
2015-01-06 20:04:19.000000000 +0100
@@ -20,34 +20,28 @@
package com.sun.org.apache.xerces.internal.impl;
-import java.io.EOFException;
-import java.io.IOException;
-import java.util.Locale;
-import java.util.Vector;
-
-import com.sun.xml.internal.stream.Entity;
-import com.sun.xml.internal.stream.XMLBufferListener;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
import com.sun.org.apache.xerces.internal.impl.io.ASCIIReader;
import com.sun.org.apache.xerces.internal.impl.io.UCSReader;
import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader;
-
-
import com.sun.org.apache.xerces.internal.impl.msg.XMLMessageFormatter;
import com.sun.org.apache.xerces.internal.util.EncodingMap;
-
import com.sun.org.apache.xerces.internal.util.SymbolTable;
import com.sun.org.apache.xerces.internal.util.XMLChar;
import com.sun.org.apache.xerces.internal.util.XMLStringBuffer;
-import com.sun.org.apache.xerces.internal.xni.QName;
-import com.sun.org.apache.xerces.internal.xni.XMLString;
+import com.sun.org.apache.xerces.internal.xni.*;
import com.sun.org.apache.xerces.internal.xni.parser.XMLComponentManager;
import com.sun.org.apache.xerces.internal.xni.parser.XMLConfigurationException;
-import com.sun.org.apache.xerces.internal.xni.*;
+import com.sun.xml.internal.stream.Entity;
+import com.sun.xml.internal.stream.XMLBufferListener;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.Locale;
+import java.util.Vector;
/**
* Implements the entity scanner methods.
@@ -493,8 +487,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
}
// peek at character
@@ -535,8 +528,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
}
// scan character
@@ -546,9 +538,8 @@
fCurrentEntity.lineNumber++;
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(1);
fCurrentEntity.ch[0] = (char)c;
- load(1, false);
+ load(1, false, true);
}
if (c == '\r' && isExternal) {
if (fCurrentEntity.ch[fCurrentEntity.position++] != '\n') {
@@ -593,8 +584,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
}
// scan nmtoken
@@ -626,7 +616,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -673,18 +663,16 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
}
// scan name
int offset = fCurrentEntity.position;
if (XMLChar.isNameStart(fCurrentEntity.ch[offset])) {
if (++fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(1);
fCurrentEntity.ch[0] = fCurrentEntity.ch[offset];
offset = 0;
- if (load(1, false)) {
+ if (load(1, false, true)) {
fCurrentEntity.columnNumber++;
String symbol = fSymbolTable.addSymbol(fCurrentEntity.ch,
0, 1);
@@ -721,7 +709,7 @@
fCurrentEntity.ch, 0, length);
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -776,8 +764,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
}
// scan qualified name
@@ -789,11 +776,10 @@
if (XMLChar.isNameStart(fCurrentEntity.ch[offset])) {
if (++fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(1);
fCurrentEntity.ch[0] = fCurrentEntity.ch[offset];
offset = 0;
- if (load(1, false)) {
+ if (load(1, false, true)) {
fCurrentEntity.columnNumber++;
//adding into symbol table.
//XXX We are trying to add single character in
SymbolTable??????
@@ -843,7 +829,7 @@
index = index - offset;
}
offset = 0;
- if (load(length, false)) {
+ if (load(length, false, false)) {
break;
}
}
@@ -918,12 +904,10 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
} else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- invokeListeners(0);
fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
- load(1, false);
+ load(1, false, true);
fCurrentEntity.position = 0;
}
@@ -945,9 +929,8 @@
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count) {
offset = 0;
- invokeListeners(newlines);
fCurrentEntity.position = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -965,9 +948,8 @@
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count) {
offset = 0;
- invokeListeners(newlines);
fCurrentEntity.position = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -1070,13 +1052,10 @@
}
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
} else if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- invokeListeners(0);
fCurrentEntity.ch[0] = fCurrentEntity.ch[fCurrentEntity.count - 1];
-
- load(1, false);
+ load(1, false, true);
fCurrentEntity.position = 0;
}
@@ -1099,10 +1078,9 @@
fCurrentEntity.lineNumber++;
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(newlines);
offset = 0;
fCurrentEntity.position = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -1121,9 +1099,8 @@
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count) {
offset = 0;
- invokeListeners(newlines);
fCurrentEntity.position = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -1249,7 +1226,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, false);
}
boolean bNextEntity = false;
@@ -1263,7 +1240,7 @@
0,
fCurrentEntity.count - fCurrentEntity.position);
- bNextEntity = load(fCurrentEntity.count -
fCurrentEntity.position, false);
+ bNextEntity = load(fCurrentEntity.count -
fCurrentEntity.position, false, false);
fCurrentEntity.position = 0;
fCurrentEntity.startPosition = 0;
}
@@ -1276,7 +1253,7 @@
fCurrentEntity.baseCharOffset += (fCurrentEntity.position -
fCurrentEntity.startPosition);
fCurrentEntity.position = fCurrentEntity.count;
fCurrentEntity.startPosition = fCurrentEntity.count;
- load(0, true);
+ load(0, true, false);
return false;
}
@@ -1298,9 +1275,8 @@
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count) {
offset = 0;
- invokeListeners(newlines);
fCurrentEntity.position = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -1318,10 +1294,9 @@
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count) {
offset = 0;
- invokeListeners(newlines);
fCurrentEntity.position = newlines;
fCurrentEntity.count = newlines;
- if (load(newlines, false)) {
+ if (load(newlines, false, true)) {
break;
}
}
@@ -1422,8 +1397,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
}
// skip character
@@ -1445,9 +1419,8 @@
} else if (c == '\n' && cc == '\r' && isExternal) {
// handle newlines
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(1);
fCurrentEntity.ch[0] = (char)cc;
- load(1, false);
+ load(1, false, true);
}
fCurrentEntity.position++;
if (fCurrentEntity.ch[fCurrentEntity.position] == '\n') {
@@ -1498,8 +1471,7 @@
//boolean entityChanged = false;
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
}
//we are doing this check only in skipSpace() because it is called by
@@ -1522,9 +1494,8 @@
fCurrentEntity.lineNumber++;
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count - 1) {
- invokeListeners(0);
fCurrentEntity.ch[0] = (char)c;
- entityChanged = load(1, true);
+ entityChanged = load(1, true, true);
if (!entityChanged){
// the load change the position to be 1,
// need to restore it when entity not changed
@@ -1549,8 +1520,7 @@
}
if (fCurrentEntity.position == fCurrentEntity.count) {
- invokeListeners(0);
- load(0, true);
+ load(0, true, true);
//we are doing this check only in skipSpace() because it
is called by
//fMiscDispatcher and we want the parser to exit
gracefully when document
@@ -1626,7 +1596,7 @@
if((fCurrentEntity.count - fCurrentEntity.position) < length){
int pos = fCurrentEntity.position;
invokeListeners(pos);
- entityChanged = load(fCurrentEntity.count, changeEntity);
+ entityChanged = load(fCurrentEntity.count, changeEntity,
false);
fCurrentEntity.position = pos;
if(entityChanged)break;
}
@@ -1731,17 +1701,22 @@
* the current entity in place and the entity
* boundary will be signaled by the return
* value.
+ * @param notify Determine whether to notify listeners of
+ * the event
*
* @returns Returns true if the entity changed as a result of this
* load operation.
*/
- final boolean load(int offset, boolean changeEntity)
+ final boolean load(int offset, boolean changeEntity, boolean notify)
throws IOException {
if (DEBUG_BUFFER) {
System.out.print("(load, "+offset+": ");
print();
System.out.println();
}
+ if (notify) {
+ invokeListeners(offset);
+ }
//maintaing the count till last load
fCurrentEntity.fTotalCountTillLastLoad =
fCurrentEntity.fTotalCountTillLastLoad + fCurrentEntity.fLastCount ;
// read characters
@@ -1778,7 +1753,7 @@
}
// handle the trailing edges
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, false);
}
}
@@ -2075,7 +2050,7 @@
*
* @param loadPos Starting position from which new data is being loaded
into scanner buffer.
*/
- private void invokeListeners(int loadPos){
+ public void invokeListeners(int loadPos){
for(int i=0;i<listeners.size();i++){
XMLBufferListener listener =(XMLBufferListener) listeners.get(i);
listener.refresh(loadPos);
@@ -2108,7 +2083,7 @@
// load more characters, if needed
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, false);
}
// skip spaces
@@ -2123,7 +2098,7 @@
fCurrentEntity.columnNumber = 1;
if (fCurrentEntity.position == fCurrentEntity.count - 1) {
fCurrentEntity.ch[0] = (char)c;
- entityChanged = load(1, true);
+ entityChanged = load(1, true, false);
if (!entityChanged)
// the load change the position to be 1,
// need to restore it when entity not changed
@@ -2151,7 +2126,7 @@
if (!entityChanged)
fCurrentEntity.position++;
if (fCurrentEntity.position == fCurrentEntity.count) {
- load(0, true);
+ load(0, true, false);
}
} while (XMLChar.isSpace(c =
fCurrentEntity.ch[fCurrentEntity.position]));
if (DEBUG_BUFFER) {
++++++ jaxws.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/jaxws-d3bef5fd93db/.hgtags
new/jaxws-9a6c90336922/.hgtags
--- old/jaxws-d3bef5fd93db/.hgtags 2014-10-02 01:41:55.000000000 +0200
+++ new/jaxws-9a6c90336922/.hgtags 2014-10-29 19:13:34.000000000 +0100
@@ -437,6 +437,9 @@
2d103c97c9bd0b3357e6d5e2b5b9ffb64c271288 jdk7u55-b31
b15b4084288fa4ea9caf7f6b4e79d164c77bb1d6 jdk7u55-b32
efd71c6ca0832e894b7e1619111860062fa96458 jdk7u55-b33
+485d7912bc20775bda670ea2236c883366590dd7 jdk7u55-b34
+587be38f9a6d60fbefc92dbe9fbd4c83d579c680 jdk7u55-b35
+62332eaec2ff8fc8bece2a905554ac08e375a661 jdk7u55-b36
cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01
8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02
@@ -468,6 +471,10 @@
9699fe5c5232952a0c75e4a5562d86b33ebe6bf5 icedtea-2.5pre07
f1f1ade53c01f57c8b5c8c0bd0864bc59b294a07 icedtea-2.5pre08
f1f1ade53c01f57c8b5c8c0bd0864bc59b294a07 icedtea-2.5.0
+39e67887a3b112bf74f84df2aac0f46c65bfb005 jdk7u60-b30
+dfc2c4b9b16bd2d68435ddc9bb12036982021844 jdk7u60-b31
+0e17943c39fadb810b4dd2e9ac732503b86043f4 jdk7u60-b32
+910559d7f754d8fd6ab80a627869877443358316 jdk7u60-b33
8ac19021e6af5d92b46111a6c41430f36ccdb901 jdk7u65-b02
a70d681bc273a110d10cf3c4f9b35b25ca6a600f jdk7u65-b03
7cd17f96988509e99fbb71003aeb76d92b638fef jdk7u65-b04
@@ -491,3 +498,38 @@
aac78bd724c437cefd9ba8abb280df34609ca936 icedtea-2.5.2
c46dd3a579f036318ca043387f4619aa2a3a0f33 icedtea-2.5.3pre01
dcb5afbd4d7d074ecb061600d6fe82254dde666d icedtea-2.5.3pre02
+d3bef5fd93db993b19f8d2ff400056960e43f90c icedtea-2.5.3
+0cd66509e11335fac490076cbdcb2f47c592de86 jdk7u65-b32
+28d868d40df0d420b87698e1215e5039d24a8ae5 jdk7u65-b20
+1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01
+db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b40
+190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31
+6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33
+d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00
+1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01
+04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09
+73d97ba8b2d94c904f2b087b9f28664eb19e9ce2 jdk7u66-b10
+7ecf8d9df00c185f381fa8cb92ea66fe1e5798ca jdk7u66-b11
+9ac1d99f712a04548d7e5d784f06c87e35023080 jdk7u66-b12
+f562dd8fb2b211a11b9a84849995d61b541723c3 jdk7u66-b13
+ae584331109f291e03af72cc9fcbbe5f8f789ab1 jdk7u66-b14
+36461c772d3101a8cb1eca16a9c81ed53218a4c9 jdk7u66-b15
+19ed8a653a3e8c6536fd1090c14f93e690eda7a3 jdk7u66-b16
+ea1e6f01f95c9a0984378643754d0f493bfa4484 jdk7u66-b17
+6092d0059338df25e82fbc69cc749b95e2565547 jdk7u71-b00
+814a3f0bb13071666375dd35bab7c9cc44c62448 jdk7u71-b01
+ba22fdc22c0410b91f6f992e480d9e8b4c5e85d0 jdk7u71-b02
+30edf4d8760f96b420bd40a2d9552826435356d4 jdk7u71-b03
+22cc8b125a119f9c23d0e81fc6627af330a27e4a jdk7u71-b04
+f612dbc0589894463f569fba245a98f842182d7a jdk7u71-b05
+15bdfc8b209a7c5b4e06907df11d3f795d326c14 jdk7u71-b06
+26ad03c06f31c516329059c5f053330570455887 jdk7u71-b07
+8d9d92a8e6d8610994d1596961395a4ce2bc5a69 jdk7u71-b08
+9ad7bbe28aecaf22c4f5c9ab905207ae963ec2c2 jdk7u71-b09
+32406b446fd458c6d0d8bd610eeb12d96a5f20a4 jdk7u71-b10
+b37043cee55ed025b04a3420908897e69c6c687f jdk7u71-b11
+3a432d7f01ed998ee6ca2ed04e818849a3d1e0c7 jdk7u71-b12
+9dd0dea849dd2550b58346977d9111717c1f38b2 jdk7u71-b13
+ac4697fab02d744e30ad60898813aadba1ad9ba0 icedtea-2.5.4pre01
+686552a98cae5fef622eb2a0e5fbe84bec3c11ca icedtea-2.5.4pre02
+c604500818dadbf3258d5881132c8e325a575d04 icedtea-2.5.4pre03
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java
---
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java
2014-10-02 01:41:55.000000000 +0200
+++
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java
2014-10-29 19:13:34.000000000 +0100
@@ -54,17 +54,21 @@
static { // we statically initializing REFLECTION_NAVIGATOR property
try {
- Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
- //noinspection unchecked
- final Method getInstance = refNav.getDeclaredMethod("getInstance");
+ final Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
// requires accessClassInPackage privilege
- AccessController.doPrivileged(
- new PrivilegedAction<Object>() {
+ final Method getInstance = AccessController.doPrivileged(
+ new PrivilegedAction<Method>() {
+
@Override
- public Object run() {
- getInstance.setAccessible(true);
- return null;
+ public Method run() {
+ try {
+ Method getInstance =
refNav.getDeclaredMethod("getInstance");
+ getInstance.setAccessible(true);
+ return getInstance;
+ } catch (NoSuchMethodException e) {
+ throw new
IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ }
}
}
);
@@ -72,16 +76,10 @@
//noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>)
getInstance.invoke(null);
} catch (ClassNotFoundException e) {
- e.printStackTrace();
throw new IllegalStateException("Can't find ReflectionNavigator
class");
} catch (InvocationTargetException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
throws the exception");
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- throw new IllegalStateException("ReflectionNavigator.getInstance
can't be found");
} catch (IllegalAccessException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
method is inaccessible");
} catch (SecurityException e) {
LOGGER.log(Level.FINE, "Unable to access
ReflectionNavigator.getInstance", e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java
---
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java
2014-10-02 01:41:55.000000000 +0200
+++
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java
2014-10-29 19:13:34.000000000 +0100
@@ -54,17 +54,20 @@
static { // we statically initializing REFLECTION_NAVIGATOR property
try {
- Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
- //noinspection unchecked
- final Method getInstance = refNav.getDeclaredMethod("getInstance");
+ final Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
// requires accessClassInPackage privilege
- AccessController.doPrivileged(
- new PrivilegedAction<Object>() {
+ final Method getInstance = AccessController.doPrivileged(
+ new PrivilegedAction<Method>() {
@Override
- public Object run() {
- getInstance.setAccessible(true);
- return null;
+ public Method run() {
+ try {
+ Method getInstance =
refNav.getDeclaredMethod("getInstance");
+ getInstance.setAccessible(true);
+ return getInstance;
+ } catch (NoSuchMethodException e) {
+ throw new
IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ }
}
}
);
@@ -72,16 +75,10 @@
//noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>)
getInstance.invoke(null);
} catch (ClassNotFoundException e) {
- e.printStackTrace();
throw new IllegalStateException("Can't find ReflectionNavigator
class");
} catch (InvocationTargetException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
throws the exception");
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- throw new IllegalStateException("ReflectionNavigator.getInstance
can't be found");
} catch (IllegalAccessException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
method is inaccessible");
} catch (SecurityException e) {
LOGGER.log(Level.FINE, "Unable to access
ReflectionNavigator.getInstance", e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
---
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
2014-10-02 01:41:55.000000000 +0200
+++
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java
2014-10-29 19:13:34.000000000 +0100
@@ -40,6 +40,8 @@
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
@@ -194,8 +196,15 @@
static {
- QName[] qnames = (System.getProperty(MAP_ANYURI_TO_URI) == null) ? new
QName[] {
- createXS("string"),
+ String MAP_ANYURI_TO_URI_VALUE = AccessController.doPrivileged(
+ new PrivilegedAction<String>() {
+ @Override
+ public String run() {
+ return System.getProperty(MAP_ANYURI_TO_URI);
+ }
+ }
+ );
+ QName[] qnames = (MAP_ANYURI_TO_URI_VALUE == null) ? new QName[] {
createXS("string"),
createXS("anySimpleType"),
createXS("normalizedString"),
createXS("anyURI"),
@@ -307,7 +316,7 @@
return v.toExternalForm();
}
});
- if (System.getProperty(MAP_ANYURI_TO_URI) == null) {
+ if (MAP_ANYURI_TO_URI_VALUE == null) {
secondaryList.add(
new StringImpl<URI>(URI.class, createXS("string")) {
public URI parse(CharSequence text) throws SAXException {
@@ -771,17 +780,18 @@
}
});
primaryList.add(
- new StringImpl<BigDecimal>(BigDecimal.class,
- createXS("decimal")
+ new StringImpl<BigDecimal>(BigDecimal.class,
+ createXS("decimal")
) {
- public BigDecimal parse(CharSequence text) {
- return
DatatypeConverterImpl._parseDecimal(text.toString());
- }
+ public BigDecimal parse(CharSequence text) {
+ return
DatatypeConverterImpl._parseDecimal(text.toString());
+ }
- public String print(BigDecimal v) {
- return DatatypeConverterImpl._printDecimal(v);
+ public String print(BigDecimal v) {
+ return DatatypeConverterImpl._printDecimal(v);
+ }
}
- });
+ );
primaryList.add(
new StringImpl<QName>(QName.class,
createXS("QName")
@@ -809,7 +819,7 @@
w.getNamespaceContext().declareNamespace(v.getNamespaceURI(),v.getPrefix(),false);
}
});
- if (System.getProperty(MAP_ANYURI_TO_URI) != null) {
+ if (MAP_ANYURI_TO_URI_VALUE != null) {
primaryList.add(
new StringImpl<URI>(URI.class, createXS("anyURI")) {
public URI parse(CharSequence text) throws SAXException {
@@ -827,16 +837,17 @@
});
}
primaryList.add(
- new StringImpl<Duration>(Duration.class, createXS("duration")) {
- public String print(Duration duration) {
- return duration.toString();
- }
+ new StringImpl<Duration>(Duration.class, createXS("duration"))
{
+ public String print(Duration duration) {
+ return duration.toString();
+ }
- public Duration parse(CharSequence lexical) {
- TODO.checkSpec("JSR222 Issue #42");
- return
DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString());
+ public Duration parse(CharSequence lexical) {
+ TODO.checkSpec("JSR222 Issue #42");
+ return
DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString());
+ }
}
- });
+ );
primaryList.add(
new StringImpl<Void>(Void.class) {
// 'void' binding isn't defined by the spec, but when the
JAX-RPC processes user-defined
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java
---
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java
2014-10-02 01:41:55.000000000 +0200
+++
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java
2014-10-29 19:13:34.000000000 +0100
@@ -54,17 +54,20 @@
static { // we statically initializing REFLECTION_NAVIGATOR property
try {
- Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
- //noinspection unchecked
- final Method getInstance = refNav.getDeclaredMethod("getInstance");
+ final Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
// requires accessClassInPackage privilege
- AccessController.doPrivileged(
- new PrivilegedAction<Object>() {
+ final Method getInstance = AccessController.doPrivileged(
+ new PrivilegedAction<Method>() {
@Override
- public Object run() {
- getInstance.setAccessible(true);
- return null;
+ public Method run() {
+ try {
+ Method getInstance =
refNav.getDeclaredMethod("getInstance");
+ getInstance.setAccessible(true);
+ return getInstance;
+ } catch (NoSuchMethodException e) {
+ throw new
IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ }
}
}
);
@@ -72,16 +75,10 @@
//noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>)
getInstance.invoke(null);
} catch (ClassNotFoundException e) {
- e.printStackTrace();
throw new IllegalStateException("Can't find ReflectionNavigator
class");
} catch (InvocationTargetException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
throws the exception");
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- throw new IllegalStateException("ReflectionNavigator.getInstance
can't be found");
} catch (IllegalAccessException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
method is inaccessible");
} catch (SecurityException e) {
LOGGER.log(Level.FINE, "Unable to access
ReflectionNavigator.getInstance", e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java
---
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java
2014-10-02 01:41:55.000000000 +0200
+++
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java
2014-10-29 19:13:34.000000000 +0100
@@ -54,17 +54,20 @@
static { // we statically initializing REFLECTION_NAVIGATOR property
try {
- Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
- //noinspection unchecked
- final Method getInstance = refNav.getDeclaredMethod("getInstance");
+ final Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
// requires accessClassInPackage privilege
- AccessController.doPrivileged(
- new PrivilegedAction<Object>() {
+ final Method getInstance = AccessController.doPrivileged(
+ new PrivilegedAction<Method>() {
@Override
- public Object run() {
- getInstance.setAccessible(true);
- return null;
+ public Method run() {
+ try {
+ Method getInstance =
refNav.getDeclaredMethod("getInstance");
+ getInstance.setAccessible(true);
+ return getInstance;
+ } catch (NoSuchMethodException e) {
+ throw new
IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ }
}
}
);
@@ -72,16 +75,10 @@
//noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>)
getInstance.invoke(null);
} catch (ClassNotFoundException e) {
- e.printStackTrace();
throw new IllegalStateException("Can't find ReflectionNavigator
class");
} catch (InvocationTargetException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
throws the exception");
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- throw new IllegalStateException("ReflectionNavigator.getInstance
can't be found");
} catch (IllegalAccessException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
method is inaccessible");
} catch (SecurityException e) {
LOGGER.log(Level.FINE, "Unable to access
ReflectionNavigator.getInstance", e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java
---
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java
2014-10-02 01:41:55.000000000 +0200
+++
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java
2014-10-29 19:13:34.000000000 +0100
@@ -54,17 +54,20 @@
static { // we statically initializing REFLECTION_NAVIGATOR property
try {
- Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
- //noinspection unchecked
- final Method getInstance = refNav.getDeclaredMethod("getInstance");
+ final Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
// requires accessClassInPackage privilege
- AccessController.doPrivileged(
- new PrivilegedAction<Object>() {
+ final Method getInstance = AccessController.doPrivileged(
+ new PrivilegedAction<Method>() {
@Override
- public Object run() {
- getInstance.setAccessible(true);
- return null;
+ public Method run() {
+ try {
+ Method getInstance =
refNav.getDeclaredMethod("getInstance");
+ getInstance.setAccessible(true);
+ return getInstance;
+ } catch (NoSuchMethodException e) {
+ throw new
IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ }
}
}
);
@@ -72,16 +75,10 @@
//noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>)
getInstance.invoke(null);
} catch (ClassNotFoundException e) {
- e.printStackTrace();
throw new IllegalStateException("Can't find ReflectionNavigator
class");
} catch (InvocationTargetException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
throws the exception");
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- throw new IllegalStateException("ReflectionNavigator.getInstance
can't be found");
} catch (IllegalAccessException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
method is inaccessible");
} catch (SecurityException e) {
LOGGER.log(Level.FINE, "Unable to access
ReflectionNavigator.getInstance", e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java
---
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java
2014-10-02 01:41:55.000000000 +0200
+++
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java
2014-10-29 19:13:34.000000000 +0100
@@ -54,17 +54,20 @@
static { // we statically initializing REFLECTION_NAVIGATOR property
try {
- Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
- //noinspection unchecked
- final Method getInstance = refNav.getDeclaredMethod("getInstance");
+ final Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
// requires accessClassInPackage privilege
- AccessController.doPrivileged(
- new PrivilegedAction<Object>() {
+ final Method getInstance = AccessController.doPrivileged(
+ new PrivilegedAction<Method>() {
@Override
- public Object run() {
- getInstance.setAccessible(true);
- return null;
+ public Method run() {
+ try {
+ Method getInstance =
refNav.getDeclaredMethod("getInstance");
+ getInstance.setAccessible(true);
+ return getInstance;
+ } catch (NoSuchMethodException e) {
+ throw new
IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ }
}
}
);
@@ -72,16 +75,10 @@
//noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>)
getInstance.invoke(null);
} catch (ClassNotFoundException e) {
- e.printStackTrace();
throw new IllegalStateException("Can't find ReflectionNavigator
class");
} catch (InvocationTargetException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
throws the exception");
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- throw new IllegalStateException("ReflectionNavigator.getInstance
can't be found");
} catch (IllegalAccessException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
method is inaccessible");
} catch (SecurityException e) {
LOGGER.log(Level.FINE, "Unable to access
ReflectionNavigator.getInstance", e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java
---
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java
2014-10-02 01:41:55.000000000 +0200
+++
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java
2014-10-29 19:13:34.000000000 +0100
@@ -54,17 +54,20 @@
static { // we statically initializing REFLECTION_NAVIGATOR property
try {
- Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
- //noinspection unchecked
- final Method getInstance = refNav.getDeclaredMethod("getInstance");
+ final Class refNav =
Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
// requires accessClassInPackage privilege
- AccessController.doPrivileged(
- new PrivilegedAction<Object>() {
+ final Method getInstance = AccessController.doPrivileged(
+ new PrivilegedAction<Method>() {
@Override
- public Object run() {
- getInstance.setAccessible(true);
- return null;
+ public Method run() {
+ try {
+ Method getInstance =
refNav.getDeclaredMethod("getInstance");
+ getInstance.setAccessible(true);
+ return getInstance;
+ } catch (NoSuchMethodException e) {
+ throw new
IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ }
}
}
);
@@ -72,16 +75,10 @@
//noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>)
getInstance.invoke(null);
} catch (ClassNotFoundException e) {
- e.printStackTrace();
throw new IllegalStateException("Can't find ReflectionNavigator
class");
} catch (InvocationTargetException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
throws the exception");
- } catch (NoSuchMethodException e) {
- e.printStackTrace();
- throw new IllegalStateException("ReflectionNavigator.getInstance
can't be found");
} catch (IllegalAccessException e) {
- e.printStackTrace();
throw new IllegalStateException("ReflectionNavigator.getInstance
method is inaccessible");
} catch (SecurityException e) {
LOGGER.log(Level.FINE, "Unable to access
ReflectionNavigator.getInstance", e);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java
---
old/jaxws-d3bef5fd93db/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java
2014-10-02 01:41:55.000000000 +0200
+++
new/jaxws-9a6c90336922/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java
2014-10-29 19:13:34.000000000 +0100
@@ -139,19 +139,12 @@
}
public EndpointReference readEndpointReference(final Source eprInfoset) {
- // EPR constructors are private, so we need privilege escalation.
- // this unmarshalling can only access instances of a fixed, known set
of classes,
- // so doing that shouldn't introduce security vulnerability.
- return AccessController.doPrivileged(new
PrivilegedAction<EndpointReference>() {
- public EndpointReference run() {
- try {
- Unmarshaller unmarshaller =
eprjc.get().createUnmarshaller();
- return (EndpointReference)
unmarshaller.unmarshal(eprInfoset);
- } catch (JAXBException e) {
- throw new WebServiceException("Error creating Marshaller
or marshalling.", e);
- }
- }
- });
+ try {
+ Unmarshaller unmarshaller = eprjc.get().createUnmarshaller();
+ return (EndpointReference) unmarshaller.unmarshal(eprInfoset);
+ } catch (JAXBException e) {
+ throw new WebServiceException("Error creating Marshaller or
marshalling.", e);
+ }
}
public <T> T getPort(EndpointReference endpointReference, Class<T> clazz,
WebServiceFeature... webServiceFeatures) {
++++++ jdk.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/java-1_7_0-openjdk/jdk.tar.bz2
/work/SRC/openSUSE:Factory/.java-1_7_0-openjdk.new/jdk.tar.bz2 differ: char 11,
line 1
++++++ langtools.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/langtools-a64b8bf851a9/.hgtags
new/langtools-960cdffa8b3f/.hgtags
--- old/langtools-a64b8bf851a9/.hgtags 2014-08-18 19:33:38.000000000 +0200
+++ new/langtools-960cdffa8b3f/.hgtags 2014-11-24 19:03:13.000000000 +0100
@@ -437,6 +437,9 @@
4f6115ba266e5489b5e1968a28304f82be1f5641 jdk7u55-b31
ec8793f5aa4fb0aff4aa2f02f458fa6720f3ec6f jdk7u55-b32
13fed9e9f022e4a7f914c8410cbaa6f6564d4efd jdk7u55-b33
+d9e4f2bb3d75d15dac2c37c6ef9f64ee49ea1728 jdk7u55-b34
+c5cfebcc373607c78d577fad2146821fafc46868 jdk7u55-b35
+284494d407006c826bc434a79cab37b17e1849e3 jdk7u55-b36
849b17bc6e9a08fa41e0ef631e51366a09842e64 jdk7u60-b00
b19e375d9829daf207b1bdc7f908a3e1d548462c jdk7u60-b01
954e1616449af74f68aed57261cbeb62403377f1 jdk7u60-b02
@@ -468,6 +471,10 @@
4548707805795436195ddb2f1dd2061dd474bed7 icedtea-2.5pre07
f70c7b79642290aabc561d5613333dc8c4d83172 icedtea-2.5pre08
f70c7b79642290aabc561d5613333dc8c4d83172 icedtea-2.5.0
+b578e801c5f0e41be96d58e213b32f5c0c9278e8 jdk7u60-b30
+c1c8f9d50b3e0d7d8af08be4270649a7572b68d4 jdk7u60-b31
+ab67af57536bf46e54b5b28462d34274aaa67025 jdk7u60-b32
+e7a68fd132f7a2f39ed72d804b4574a4cc3defb2 jdk7u60-b33
75b8c65f4c148baa4084022035b22de47df9426b jdk7u65-b02
16bb02dae837566f3c350c6313b09f6110dcba68 jdk7u65-b03
91677116552f743f3589f3d2ba255fa1079c0c48 jdk7u65-b04
@@ -491,3 +498,38 @@
f444e2a7764393fa62cc1ec9dcaa3a9f7ebbc551 icedtea-2.5.2
fe8926c95af9d3c2cd4b1b6a6e107edbd52542cd icedtea-2.5.3pre01
0e3fd42f269632e424acb551b67565e4d21b464f icedtea-2.5.3pre02
+a64b8bf851a9128a3eb785e5c9d0757f8c5c9470 icedtea-2.5.3
+afc940d62b49059f565f87c83343fa3d28df883b jdk7u65-b32
+114c4fc53777e4067a26f6510fe72fa770a9253c jdk7u65-b20
+8a09cca8f12027ba59df4bb18d49e855c4db4811 jdk7u67-b01
+eae289997f58ef6396dc323c3d5b93a56fb43573 jdk7u65-b40
+5e4cc118e2d1f7a8eefca5dd7146d46a1b0ca911 jdk7u65-b31
+59575d1928f98d1e26ea548ff4d5e2415dfe9b57 jdk7u65-b33
+684f0285b699d304d1efff487b550ff2e1679e98 jdk7u66-b00
+a927daae851fa81d0470d2b67f52e8156e4d423c jdk7u66-b01
+6f229fda19bdabf7a3d1caad9d809dd713cce65d jdk7u66-b09
+77e053e3a41f254d99e7a1151b6cf874265132e5 jdk7u66-b10
+596cf48685bcf7970275ce637ea2e58b16e9816e jdk7u66-b11
+021fb086f47f6f3659f0fe2de824c3b5548530c4 jdk7u66-b12
+b9801badec029e241a580aa52db27e03fc5e2b88 jdk7u66-b13
+3ceea3a91e4cbc29a435519747c22dfb02e68f67 jdk7u66-b14
+2918f02cde3e0fd134e2051e67296c3f935825e6 jdk7u66-b15
+9442596a63f000f4290265aa0574ee5fa8865808 jdk7u66-b16
+bd740cf100e1f7f866bd902fb668e77dcd866251 jdk7u66-b17
+df0aa7e382459053c7fa92f133080cdf679c6100 jdk7u71-b00
+46244a1e94b97b324a9ab97322b710af63b2f20b jdk7u71-b01
+29583e3ca6f9cb337fb203a84be70d234e667c1d jdk7u71-b02
+8a5c2c7dd6dce2c0540ace9c4372cf984ad62b9b jdk7u71-b03
+c4b7f94c483e9092ab634067095f4f325f9648a9 jdk7u71-b04
+103784a125a4a4fa40981f524a64cfd5b0c61722 jdk7u71-b05
+6d6a78b11de79b7f38c95e597ea0f33952716e99 jdk7u71-b06
+6c6763cce51e8e888130033350dc37114b17b6a5 jdk7u71-b07
+a5e828c017c4371d7a8cd0be812e7282dc5b7772 jdk7u71-b08
+42d1ec856f73bf3378346d66ad42cd5c57a5f8f2 jdk7u71-b09
+1579a3e24c494de0ee63bed2a4c3fbd176e95abc jdk7u71-b10
+df957022bc94fc84c3d9e6f1f23af29b6afeb63d jdk7u71-b11
+a8fd0637a601ee2747e785bd5e9e2a0262acf280 jdk7u71-b12
+1cefc4b498a60ebc86b76eb2e9e861dbb072bd85 jdk7u71-b13
+6bbb3de3efa5e79df741020a9f55fc5386c0c727 icedtea-2.5.4pre01
+622e6cf4c032ece5d1b553dbf4f36f404cfc8122 icedtea-2.5.4pre02
+412a4f8c67e8ab5c84e168e5d392a8944c89898c icedtea-2.5.4pre03
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/langtools-a64b8bf851a9/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties
new/langtools-960cdffa8b3f/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties
---
old/langtools-a64b8bf851a9/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties
2014-08-18 19:33:38.000000000 +0200
+++
new/langtools-960cdffa8b3f/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties
2014-11-24 19:03:13.000000000 +0100
@@ -37,7 +37,7 @@
javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B
javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
javac.opt.processorpath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
javac.opt.processor=\u5B9F\u884C\u3059\u308B\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u540D\u524D\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u691C\u51FA\u51E6\u7406\u3092\u30D0\u30A4\u30D1\u30B9
javac.opt.proc.none.only=\u6CE8\u91C8\u51E6\u7406\u3084\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002
++++++ openjdk.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/icedtea7-forest-2-5-49dc79ef05ab/.hgtags
new/icedtea7-forest-2-5-6cf2880aab5e/.hgtags
--- old/icedtea7-forest-2-5-49dc79ef05ab/.hgtags 2014-10-02
01:42:05.000000000 +0200
+++ new/icedtea7-forest-2-5-6cf2880aab5e/.hgtags 2015-01-06
20:04:22.000000000 +0100
@@ -435,6 +435,9 @@
1f52edec29fd44c8bacce11ba7440287b37d04d1 jdk7u55-b31
5b15555172019b3c92484abff7c92f066e162d29 jdk7u55-b32
fa5ead8cb7d2de49cd138d93fb86fa5a10b07037 jdk7u55-b33
+6041c68893932ee16a272a8d5a42069e217d888c jdk7u55-b34
+8733fb47b3338e9285870b09eb326e758cf69771 jdk7u55-b35
+b9c954604ecaaf8d8a1568ababd9508ff09b742e jdk7u55-b36
11147a12bd8c6b02f98016a8d1151e56f42a43b6 jdk7u60-b00
88113cabda386320a087b288d43e792f523cc0ba jdk7u60-b01
6bdacebbc97f0a03be45be48a6d5b5cf2f7fe77d jdk7u60-b02
@@ -466,6 +469,10 @@
d42df0b6ea9d7c736e0dcc0cb2562c0ee18928f2 icedtea-2.5pre07
6a4e587022352c27af42e7f725bdce23cecd039f icedtea-2.5pre08
6a4e587022352c27af42e7f725bdce23cecd039f icedtea-2.5.0
+ac5183999ba532c6b89f24fe01f6f0eb96799719 jdk7u60-b30
+7e9c1a4c2d50e10ccc6d81b8dc0786e82128a676 jdk7u60-b31
+f792c1446b57932f5cd661afa72bcf41cfe6d1a6 jdk7u60-b32
+870408bbbfa50a6f44997a844c6c31c0cb0cbc40 jdk7u60-b33
3a683f1730a148bcc1ca6eb9137116db427093f6 jdk7u65-b02
c154a8de7d34128ab75f46a2b6a909796f63b6e3 jdk7u65-b03
62e22dbc36410d76716bfa5e9fd679fcb4b1d845 jdk7u65-b04
@@ -489,3 +496,38 @@
de1fbcb0855887e803b71a8da642c377c85c3780 icedtea-2.5.2
dfe93c56a5f60a4ef0f3b3727d7784b6879a5bd9 icedtea-2.5.3pre01
6f40002d1813d0f57cdf7d3c3b4d0edecf56d77e icedtea-2.5.3pre02
+49dc79ef05ab17ff7458755569551199ced0b72c icedtea-2.5.3
+90f56be6f9d90f66e558c4e08084e2b169738fba jdk7u65-b32
+b6da128e8a7957f139933a48580e201e938c4684 jdk7u65-b20
+d6a1d32534d188e73f7962d40d21584c44e65acd jdk7u67-b01
+64dbd70735c775bef1faf873e4bec65d73d597cb jdk7u65-b40
+9dfdf107c6971cd30c7e1f656cddc6b8d495c290 jdk7u65-b31
+fe700de0735dc4e8ce5a50971ad3ea3dc052d21d jdk7u65-b33
+48eb3345e05fe904d2e92067da0abd04a9b375e4 jdk7u66-b00
+4fb9423d086d86d212257afd6fc79957f737af5b jdk7u66-b01
+964663d4303723fbcb16cf05e857576c08c237ae jdk7u66-b09
+6bf8128234ad7ffae0cfe53ba19202559743de97 jdk7u66-b10
+0d8c4e40851835989386c1b1db4041b6f18b037e jdk7u66-b11
+422f828e10beb3ca9e14b10774e624ec0c4fc84d jdk7u66-b12
+236545aa997a99b397e73dc9b13353231f20ea1e jdk7u66-b13
+d06bbfe19d6cefe62e359c2fd8bf9243a148a337 jdk7u66-b14
+df30693e9a66897ba0dced205bbaefc57dca7704 jdk7u66-b15
+6dc5eb9b70071b43cb0e287f30afd0348ae20ae1 jdk7u66-b16
+4f4905b6d3e837c50654bc432956a4a100246d4e jdk7u66-b17
+c779fbb7b87ec014a3371b0dd1e9317ba1280469 jdk7u71-b00
+4f0a225f8d383d22a890575b1206f916277c0a07 jdk7u71-b01
+94e1109f4cb79ba1c5369d93d0cdf300f1434a3a jdk7u71-b02
+91df9e49ab7d35ee61f88eedd4289aa33163287d jdk7u71-b03
+47c30fe92b9dad64f99d7aa72a2258bc3558f0a1 jdk7u71-b04
+d534e7f2caadd145b30dfda8b913c9a5fdb62553 jdk7u71-b05
+8821211202a58c0086e7cd57960a3f33e5c3d4a1 jdk7u71-b06
+6955561791886ef36236799794e4be79d0a65007 jdk7u71-b07
+fac69efbf4eb609e860c8c4a056dbe02b3679b87 jdk7u71-b08
+ac4596f9cdeb084af75884825e04dbcf1fd3d407 jdk7u71-b09
+38f4eee9c9387d3f683b86657fd6e3d4a90e5b0f jdk7u71-b10
+e9663e434024cb6e011013e774445a056417bb3b jdk7u71-b11
+78aa78b55b843697a630ed886962ab07d1b76358 jdk7u71-b12
+9fc5aeb0e0a8c97b1cd263a55f3aeb030cbcdf89 jdk7u71-b13
+39495d637282db1073b99f20f5924203f8c47e16 icedtea-2.5.4pre01
+f94395c841f46f8ffbf41b14e07cb90c15a55579 icedtea-2.5.4pre02
+1bcd6e8a9bc04fbc31b37de6856ad50d08cb96b9 icedtea-2.5.4pre03
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
