Re: Infinite Loop in KeepAliveStream

2012-12-16 Thread Chris Hegarty


On 15/12/2012 01:56, Martin Buchholz wrote:

...

I was trying to avoid ever calling skip with a larger argument than
available(), trying to obey the comment
// Do this ONLY if the skip won't block.
So my version feels safer, although again I don't have the full context.


OK, makes sense. I'm ok with your version. This code seems to have been 
written with thread-safety "half" in mind, your change is probably the 
safest.


Can you also include the test in the changeset? Or do you want me to 
push it for you?


-Chris.


hg: jdk8/tl/jdk: 7197159: accept different kvno if there no match

2012-12-16 Thread weijun . wang
Changeset: eaaec81aa974
Author:weijun
Date:  2012-12-17 12:18 +0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/eaaec81aa974

7197159: accept different kvno if there no match
Reviewed-by: xuelei

! src/share/classes/sun/security/krb5/EncryptionKey.java
! test/sun/security/krb5/auto/DynamicKeytab.java
+ test/sun/security/krb5/auto/KvnoNA.java
! test/sun/security/krb5/auto/MoreKvno.java



hg: jdk8/tl/jaxws: 2 new changesets

2012-12-16 Thread lana . steuck
Changeset: d3fe408f3a9a
Author:katleman
Date:  2012-12-06 12:04 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jaxws/rev/d3fe408f3a9a

Added tag jdk8-b67 for changeset eb06aa51dfc2

! .hgtags

Changeset: 756323c99011
Author:katleman
Date:  2012-12-13 09:05 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jaxws/rev/756323c99011

Added tag jdk8-b68 for changeset d3fe408f3a9a

! .hgtags



hg: jdk8/tl/langtools: 4 new changesets

2012-12-16 Thread lana . steuck
Changeset: e9a13a6c9d5d
Author:katleman
Date:  2012-12-06 12:04 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/e9a13a6c9d5d

Added tag jdk8-b67 for changeset 303b09787a69

! .hgtags

Changeset: 014a6a11dfe5
Author:lana
Date:  2012-12-10 20:59 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/014a6a11dfe5

Merge

- test/tools/javac/defaultMethodExecution/DefaultMethodRegressionTests.java
- test/tools/javac/diags/examples/InvalidGenericDescInFunctionalInterface.java
- test/tools/javac/lambda/LambdaConversionTest.java

Changeset: 13ccb5269f3d
Author:katleman
Date:  2012-12-13 09:05 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/13ccb5269f3d

Added tag jdk8-b68 for changeset 014a6a11dfe5

! .hgtags

Changeset: f72dc656a306
Author:lana
Date:  2012-12-16 22:10 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/langtools/rev/f72dc656a306

Merge




hg: jdk8/tl/corba: 2 new changesets

2012-12-16 Thread lana . steuck
Changeset: 82000531feaa
Author:katleman
Date:  2012-12-06 12:04 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/corba/rev/82000531feaa

Added tag jdk8-b67 for changeset 394515ad2a55

! .hgtags

Changeset: 22ddcac208a8
Author:katleman
Date:  2012-12-13 09:05 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/corba/rev/22ddcac208a8

Added tag jdk8-b68 for changeset 82000531feaa

! .hgtags



hg: jdk8/tl/jaxp: 3 new changesets

2012-12-16 Thread lana . steuck
Changeset: b854e7008421
Author:katleman
Date:  2012-12-06 12:04 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jaxp/rev/b854e7008421

Added tag jdk8-b67 for changeset 83df3493ca3c

! .hgtags

Changeset: 789a855de959
Author:katleman
Date:  2012-12-13 09:05 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jaxp/rev/789a855de959

Added tag jdk8-b68 for changeset b854e7008421

! .hgtags

Changeset: 8a20e948b806
Author:lana
Date:  2012-12-16 22:05 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jaxp/rev/8a20e948b806

Merge




hg: jdk8/tl: 13 new changesets

2012-12-16 Thread lana . steuck
Changeset: 98a7af257bee
Author:erikj
Date:  2012-12-03 10:26 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/98a7af257bee

8003819: build-infra: backslashes at end of LIB and INCLUDE in spec.gmk
Summary: Removing trailing backslash from LIB and INCLUDE.
Reviewed-by: ohrstrom, ohair

! common/autoconf/generated-configure.sh
! common/autoconf/toolchain_windows.m4

Changeset: 754f91d22e1c
Author:erikj
Date:  2012-12-05 09:39 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/754f91d22e1c

8001541: Cannot build on Solaris using softlinks
Summary: Fixed softlink resolver macro in configure.
Reviewed-by: tbell, ohair

! common/autoconf/basics.m4
! common/autoconf/generated-configure.sh

Changeset: ec187d02c95e
Author:erikj
Date:  2012-12-05 10:12 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/ec187d02c95e

8004281: build-infra: Move all jar creation to images target and put jars in 
images/lib
Summary: Fixed bug in setting up make dependencies in SetupArchive.
Reviewed-by: ohair, tbell, dholmes

! common/makefiles/JavaCompilation.gmk

Changeset: bd32ef0789ca
Author:erikj
Date:  2012-12-05 16:35 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/bd32ef0789ca

8003414: build-infra: fails on on windows
Summary: Added extra check that windows sdk is valid.
Reviewed-by: tbell, ohrstrom, ohair

! common/autoconf/generated-configure.sh
! common/autoconf/toolchain_windows.m4

Changeset: 9a6ec97ec45c
Author:katleman
Date:  2012-12-05 12:52 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/9a6ec97ec45c

Merge


Changeset: c91c581321ce
Author:katleman
Date:  2012-12-06 12:04 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/c91c581321ce

Added tag jdk8-b67 for changeset 9a6ec97ec45c

! .hgtags

Changeset: 04435608c613
Author:lana
Date:  2012-12-10 20:52 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/04435608c613

Merge


Changeset: 6b96b7744913
Author:erikj
Date:  2012-12-07 17:23 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/6b96b7744913

8004045: build-infra: Error 12 from zip when updating src.zip
Summary: Hiding this error from make so that it doesn't fail
Reviewed-by: ohrstrom, dholmes

! common/makefiles/JavaCompilation.gmk

Changeset: 2795874efd16
Author:erikj
Date:  2012-12-11 11:29 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/2795874efd16

8003945: build-infra: problems finding compiler when using --with-dev-kit
Summary: Search all compiler names in dev-kit dir first.
Reviewed-by: tbell

! common/autoconf/generated-configure.sh
! common/autoconf/toolchain.m4

Changeset: e175ecff1391
Author:erikj
Date:  2012-12-11 11:33 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/e175ecff1391

8001753: build-infra: mismatch with full debug symbol control for hotspot
Summary: Enabling hotspot to use the FDS settings established at configure time
Reviewed-by: dholmes, ohair

! common/autoconf/generated-configure.sh
! common/autoconf/hotspot-spec.gmk.in
! common/autoconf/jdk-options.m4
! common/makefiles/NativeCompilation.gmk

Changeset: cdb401a60cea
Author:katleman
Date:  2012-12-12 13:19 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/cdb401a60cea

Merge


Changeset: e9ec00893bb4
Author:katleman
Date:  2012-12-13 09:05 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/e9ec00893bb4

Added tag jdk8-b68 for changeset cdb401a60cea

! .hgtags

Changeset: 2ed5be3dd506
Author:lana
Date:  2012-12-16 22:02 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/rev/2ed5be3dd506

Merge




hg: jdk8/tl/hotspot: 48 new changesets

2012-12-16 Thread lana . steuck
Changeset: e1d42ba865de
Author:amurillo
Date:  2012-11-16 09:43 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/e1d42ba865de

8003541: new hotspot build - hs25-b11
Reviewed-by: jcoomes

! make/hotspot_version

Changeset: 49cbd3e25ba9
Author:zgu
Date:  2012-11-16 09:05 -0500
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/49cbd3e25ba9

8003487: NMT: incorrect assertion in 
VMMemPointerIterator::remove_released_region method (memSnapshot.cpp)
Summary: The assertion is applied to only the region to be released, also 
performs region integrity checking
Reviewed-by: acorn, coleenp

! src/share/vm/services/memSnapshot.cpp
! src/share/vm/services/memSnapshot.hpp

Changeset: 3ed6de6e139b
Author:coleenp
Date:  2012-11-20 20:27 -0500
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/3ed6de6e139b

Merge


Changeset: 73e64867adb7
Author:mikael
Date:  2012-11-21 09:02 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/73e64867adb7

8003690: Example code in JVMTI GetStackTrace documentation is broken
Summary: Fixed to minor errors in example code
Reviewed-by: sspitsyn, dholmes

! src/share/vm/prims/jvmti.xml

Changeset: 6b881a6b0665
Author:dholmes
Date:  2012-11-21 20:07 -0500
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/6b881a6b0665

8003591: Abstract_VM_Version::internal_vm_info_string needs to stringify 
FLOAT_ARCH for ease of use
Reviewed-by: coleenp, kvn

! src/share/vm/runtime/vm_version.cpp

Changeset: ca1be5fbe6ff
Author:dholmes
Date:  2012-11-21 21:26 -0500
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/ca1be5fbe6ff

Merge


Changeset: 7c15faa95ce7
Author:mikael
Date:  2012-11-27 07:57 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/7c15faa95ce7

8003879: Duplicate definitions in vmStructs
Summary: Removed duplicate entries
Reviewed-by: dholmes, sspitsyn

! src/share/vm/gc_implementation/concurrentMarkSweep/vmStructs_cms.hpp
! src/share/vm/prims/jni.cpp
! src/share/vm/runtime/vmStructs.cpp
! src/share/vm/runtime/vmStructs.hpp

Changeset: bbc14465e7db
Author:zgu
Date:  2012-11-28 09:19 -0500
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/bbc14465e7db

8003689: MemTracker::init_tracking_options() reads outside array if commandline 
argument is empty
Summary: Fixed potential buffer overrun when giving empty option to 
NativeMemoryTracking commandline option
Reviewed-by: ctornqvi, hseigel, kvn

! src/share/vm/services/memTracker.cpp

Changeset: 5de2a5bd519e
Author:zgu
Date:  2012-11-28 06:42 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/5de2a5bd519e

Merge


Changeset: fe81517cfb77
Author:hseigel
Date:  2012-11-28 08:17 -0500
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/fe81517cfb77

6924920: Class Data Sharing limit on the java version string can create failures
Summary: Truncate the java version string and add a hash value if it is too 
long.
Reviewed-by: dholmes, coleenp

! src/share/vm/memory/filemap.cpp

Changeset: b51dc8df86e5
Author:coleenp
Date:  2012-11-28 08:43 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/b51dc8df86e5

Merge


Changeset: 59c790074993
Author:coleenp
Date:  2012-11-28 17:50 -0500
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/59c790074993

8003635: NPG: AsynchGetCallTrace broken by Method* virtual call
Summary: Make metaspace::contains be lock free and used to see if something is 
in metaspace, also compare Method* with vtbl pointer.
Reviewed-by: dholmes, sspitsyn, dcubed, jmasa

! src/cpu/sparc/vm/frame_sparc.cpp
! src/cpu/x86/vm/frame_x86.cpp
! src/share/vm/gc_interface/collectedHeap.hpp
! src/share/vm/gc_interface/collectedHeap.inline.hpp
! src/share/vm/memory/allocation.cpp
! src/share/vm/memory/allocation.hpp
! src/share/vm/memory/metaspace.cpp
! src/share/vm/memory/metaspace.hpp
! src/share/vm/memory/universe.cpp
! src/share/vm/oops/compiledICHolder.cpp
! src/share/vm/oops/method.cpp
! src/share/vm/oops/method.hpp
! src/share/vm/prims/forte.cpp
! src/share/vm/utilities/globalDefinitions.hpp

Changeset: 53715fb1597d
Author:brutisso
Date:  2012-11-20 11:40 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/53715fb1597d

7198334: UseNUMA modifies system parameters on non-NUMA system
Summary: The flags MinHeapDeltaBytes and UseNUMAInterleaving must be adjusted 
after the OS have adjusted the UseNUMA flag in the method os::init_2.
Reviewed-by: dholmes, brutisso
Contributed-by: erik.he...@oracle.com

! src/share/vm/runtime/arguments.cpp
! src/share/vm/runtime/arguments.hpp
! src/share/vm/runtime/thread.cpp

Changeset: 19c1bd641922
Author:coleenp
Date:  2012-11-26 12:31 -0500
URL:   http://hg.openjdk.java.net/jdk8/tl/hotspot/rev/19c1bd641922

8003722: More gcc 4.7 compilation errors
Summary: Add a few more this->qualifications.
Reviewed-by: coleenp, dholmes
Contributed-by: dubo...@ssw.jku.at

! src/share/vm/m

hg: jdk8/tl/jdk: 31 new changesets

2012-12-16 Thread lana . steuck
Changeset: b0f008ab45d7
Author:twisti
Date:  2012-11-30 11:42 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/b0f008ab45d7

8001885: JSR 292 classes should use jdk.internal.org.objectweb.asm
Reviewed-by: kvn, jrose, twisti
Contributed-by: David Chase 

! src/share/classes/java/lang/invoke/BoundMethodHandle.java
! src/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java

Changeset: 0fda013e4638
Author:erikj
Date:  2012-12-05 10:12 +0100
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/0fda013e4638

8004281: build-infra: Move all jar creation to images target and put jars in 
images/lib
Reviewed-by: ohair, tbell, dholmes

! makefiles/CompileDemos.gmk
! makefiles/CompileJavaClasses.gmk
! makefiles/CreateJars.gmk
! makefiles/Images.gmk
! makefiles/Import.gmk

Changeset: ce9b02a3a17e
Author:katleman
Date:  2012-12-05 12:53 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/ce9b02a3a17e

Merge


Changeset: ea0d3a9d0d01
Author:katleman
Date:  2012-12-06 12:04 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/ea0d3a9d0d01

Added tag jdk8-b67 for changeset ce9b02a3a17e

! .hgtags

Changeset: 39f9b2cc5738
Author:bae
Date:  2012-11-28 12:28 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/39f9b2cc5738

4649812: GIFImageReader handles transparency incorrectly
Reviewed-by: bae, prr
Contributed-by: Vadim Pakhnushev 

! src/share/classes/com/sun/imageio/plugins/gif/GIFImageReader.java

Changeset: 6569819eb2fe
Author:bae
Date:  2012-11-28 12:38 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/6569819eb2fe

5082749: GIF stream metadata specification of aspect ratio is incorrect
Reviewed-by: bae, prr
Contributed-by: Vadim Pakhnushev 

! src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html

Changeset: 934595726263
Author:bae
Date:  2012-11-28 14:12 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/934595726263

7064516: ImageIO.read() fails to load an image
Reviewed-by: jgodinez, prr

! src/share/classes/java/awt/color/ICC_Profile.java
! src/share/classes/java/awt/image/ColorConvertOp.java
+ test/sun/java2d/cmm/ColorConvertOp/InvalidRenderIntentTest.java

Changeset: d54db1e16b97
Author:bae
Date:  2012-11-30 11:32 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/d54db1e16b97

7124223: [macosx] Regression test failure with new exception, when glyph is 
positioned explicitly
Reviewed-by: jgodinez

! src/share/classes/sun/print/PathGraphics.java

Changeset: bd3b3cda125d
Author:lana
Date:  2012-11-30 16:02 -0800
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/bd3b3cda125d

Merge


Changeset: 3c5bf5ed45a9
Author:bae
Date:  2012-12-03 16:26 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/3c5bf5ed45a9

7124347: [macosx] java.lang.InternalError: not implemented yet on call 
Graphics2D.drawRenderedImage
Reviewed-by: prr, flar

! src/share/classes/sun/java2d/opengl/OGLBlitLoops.java
! src/share/classes/sun/java2d/opengl/OGLSurfaceDataProxy.java
+ test/sun/java2d/OpenGL/CustomCompositeTest.java

Changeset: 1175410d98ea
Author:serb
Date:  2012-11-21 15:50 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/1175410d98ea

7124552: [macosx] NullPointerException in getBufferStrategy()
7124219: [macosx] Unable to draw images to fullscreen
Reviewed-by: bae, anthony

! src/macosx/classes/sun/awt/CGraphicsConfig.java
! src/macosx/classes/sun/java2d/opengl/CGLGraphicsConfig.java
! src/macosx/classes/sun/lwawt/LWCanvasPeer.java
! src/macosx/classes/sun/lwawt/LWComponentPeer.java
+ src/macosx/classes/sun/lwawt/LWGraphicsConfig.java
! src/macosx/classes/sun/lwawt/LWWindowPeer.java
! src/macosx/classes/sun/lwawt/PlatformWindow.java
! src/macosx/classes/sun/lwawt/macosx/CPlatformEmbeddedFrame.java
! src/macosx/classes/sun/lwawt/macosx/CPlatformView.java
! src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
- src/share/classes/sun/awt/TextureSizeConstraining.java

Changeset: 5b2c31d20a64
Author:serb
Date:  2012-11-21 15:54 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/5b2c31d20a64

7193214: Consider simplifying CPlatformWindow.setResizable()
Reviewed-by: anthony, denis

! src/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java
! src/macosx/native/sun/awt/AWTWindow.m

Changeset: c9dead63607c
Author:serb
Date:  2012-11-21 15:58 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/c9dead63607c

7154516: [macosx] Popup menus have no visible borders
Reviewed-by: anthony, denis

! src/macosx/classes/com/apple/laf/AquaLookAndFeel.java

Changeset: 9cd48409539e
Author:kizune
Date:  2012-11-21 20:42 +0400
URL:   http://hg.openjdk.java.net/jdk8/tl/jdk/rev/9cd48409539e

8003273: Missing testcase for 7171812
Reviewed-by: art, serb

+ test/javax/swing/dnd/7171812/JListWithScroll.java
+ test/javax/swing/dnd/7171812/bug7171812.java

Changeset: 565b87fb
Author:serb
Date:  2012-11-27 17:03 +