Re: Questions about XJC tool.

2011-03-07 Thread Steve Poole

On 07/03/11 05:03, Sean Chou wrote:

Hi,

Just two questions about xjc.

About this bug XJC fails to generate a class for a type with1
wildcard(http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6927454),
is there a plan to fix it?

And I find the xjc tool is under the directory jaxws/.hg/store/data/src/
share/classes/com/sun/tools/internal/ in my working copy(using
hg fclone  http://hg.openjdk.java.net/jdk7/jdk7/). Is there any other place
I can find its source?

I assume that bugs in JAXB have to be fixed in the JAXB project, not in 
OpenJDK.I don't know how the  relationship between OpenJDK and 
JAXB/JAXWS/JAXP  works. Maybe someone can explain usual working 
practises for getting these sort of bugs fixed?

Thanks.





Re: Questions about XJC tool.

2011-03-07 Thread Alan Bateman

Sean Chou wrote:

Hi,

   Just two questions about xjc.

   About this bug XJC fails to generate a class for a type with 1
wildcard(http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6927454),
is there a plan to fix it?

   And I find the xjc tool is under the directory jaxws/.hg/store/data/src/
share/classes/com/sun/tools/internal/ in my working copy(using
hg fclone  http://hg.openjdk.java.net/jdk7/jdk7/). Is there any other place
I can find its source?

   Thanks.

  
As David points out, this issue appears to have been fixed last year by 
adding a new option to xjc. I don't know why bugs.sun.com isn't showing 
the up to date bug but there has been some ongoing glitches with the 
mirroring of the bugs. I'll ask the folks who maintain this to see if 
this can be resolved.


In any case, it's worth remembering that the JAX* components are 
maintained in the upstream jaxp and jax-ws projects so this is why you 
don't see the code in the jdk7 forest. The jaxws repository in the 
forest will build it from a local copy of the source or it can download 
it. The .hg/store tree is where mercurial keeps its internal data 
structures so you probably don't want to be changing files in there. The 
sources you see in there are probably from 2009, when OpenJDK ceased to 
maintain its own copy of the this code.


-Alan.


Re: Request for review: 7022370 Launcher ergonomics doesn't need per-architecture implementations

2011-03-07 Thread Gary Benson
Hi David,

I'm good with these changes, and I'm happy for ergo_zero.c to vanish.

Thanks,
Gary

David Holmes wrote:
 Hopefully all interested parties are addressed in the cc lists.

 webrev at:

 http://cr.openjdk.java.net/~dholmes/7022370/webrev/

 The launcher ergonomics (ergo.c) currently relies on
 per-architecture, eg ergo_sparc.c, ergo_i586.c, files to define the
 actual ergonomics operations. Only x86 is actually CPU specific,
 both sparc and zero share the same platform independent
 implementation. It will simplify things if we provide a platform
 independent default in ergo.c that is conditionally compiled, and
 modify the build system to cause that compilation if a platform
 specific ergo file is not found.

 We can potentially delete all the ergo_*.c files except for
 ergo_i586.c, and we no longer require that there be a
 per-architecture file, which makes additional porting easier.

 Gary: do you mind seeing ergo_zero.c go away, or would you prefer to
 leave it in case someone is doing a local customization? I suppose
 the some consideration could be given to ergo_sparc.c too. Is
 anybody aware of downstream distros that modify these files to
 change the default ergonomics policies?

 Thanks,
 David Holmes

-- 
http://gbenson.net/


hg: jdk7/tl/langtools: 7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes

2011-03-07 Thread maurizio . cimadamore
Changeset: ca32f2986301
Author:mcimadamore
Date:  2011-03-07 14:31 +
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/ca32f2986301

7020044: Project Coin: diamond erroneous allowed on some anonymous inner classes
Summary: Disallow diamond on anonymous innner class creation expression (as per 
JSR 334's EDR)
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/comp/Attr.java
! src/share/classes/com/sun/tools/javac/comp/Check.java
! src/share/classes/com/sun/tools/javac/resources/compiler.properties
! test/tools/javac/diags/examples.not-yet.txt
+ test/tools/javac/diags/examples/DiamondAndAnonClass.java
- test/tools/javac/diags/examples/DiamondInvalidArg.java
- test/tools/javac/diags/examples/DiamondInvalidArgs.java
! test/tools/javac/generics/diamond/6996914/T6996914a.java
! test/tools/javac/generics/diamond/6996914/T6996914b.java
! test/tools/javac/generics/diamond/T6939780.java
! test/tools/javac/generics/diamond/T6939780.out
! test/tools/javac/generics/diamond/neg/Neg01.java
! test/tools/javac/generics/diamond/neg/Neg01.out
! test/tools/javac/generics/diamond/neg/Neg02.java
! test/tools/javac/generics/diamond/neg/Neg02.out
! test/tools/javac/generics/diamond/neg/Neg03.java
! test/tools/javac/generics/diamond/neg/Neg03.out
! test/tools/javac/generics/diamond/neg/Neg04.java
! test/tools/javac/generics/diamond/neg/Neg04.out
! test/tools/javac/generics/diamond/neg/Neg05.java
! test/tools/javac/generics/diamond/neg/Neg05.out
! test/tools/javac/generics/diamond/neg/Neg06.java
! test/tools/javac/generics/diamond/neg/Neg06.out
! test/tools/javac/generics/diamond/neg/Neg07.java
! test/tools/javac/generics/diamond/neg/Neg07.out
! test/tools/javac/generics/diamond/neg/Neg08.java
! test/tools/javac/generics/diamond/neg/Neg08.out
! test/tools/javac/generics/diamond/neg/Neg09.java
! test/tools/javac/generics/diamond/neg/Neg09.out
! test/tools/javac/generics/diamond/neg/Neg10.java
! test/tools/javac/generics/diamond/neg/Neg11.java
- test/tools/javac/generics/diamond/neg/Neg12.java
- test/tools/javac/generics/diamond/neg/Neg12.out
! test/tools/javac/generics/diamond/pos/Pos01.java
! test/tools/javac/generics/diamond/pos/Pos02.java
! test/tools/javac/generics/diamond/pos/Pos03.java
! test/tools/javac/generics/diamond/pos/Pos04.java
! test/tools/javac/generics/diamond/pos/Pos05.java
+ test/tools/javac/generics/diamond/pos/Pos06.java
+ test/tools/javac/generics/diamond/pos/Pos07.java
- test/tools/javac/multicatch/Neg05.java
- test/tools/javac/multicatch/Neg05.out
+ test/tools/javac/multicatch/Pos09.java



hg: jdk7/tl/langtools: 7024568: Very long method resolution causing OOM error

2011-03-07 Thread maurizio . cimadamore
Changeset: 74f0c05c51eb
Author:mcimadamore
Date:  2011-03-07 14:11 +
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/74f0c05c51eb

7024568: Very long method resolution causing OOM error
Summary: Resolve.findMethod scans same receiver type more than once in certain 
inheritance graphs
Reviewed-by: jjg
Contributed-by: jan.lah...@oracle.com

! src/share/classes/com/sun/tools/javac/comp/Resolve.java
+ test/tools/javac/7024568/T7024568.java
+ test/tools/javac/7024568/T7024568.out



hg: jdk7/tl/jdk: 7025105: TEST_BUG test/com/sun/jndi/ldap/NoWaitForReplyTest.java should be cleaned up

2011-03-07 Thread sean . coffey
Changeset: 339342f311cc
Author:coffeys
Date:  2011-03-07 14:43 +
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/339342f311cc

7025105: TEST_BUG test/com/sun/jndi/ldap/NoWaitForReplyTest.java should be 
cleaned up
Reviewed-by: alanb

! test/com/sun/jndi/ldap/NoWaitForReplyTest.java



hg: jdk7/tl/jdk: 2 new changesets

2011-03-07 Thread sean . mullan
Changeset: bc0c58d65e97
Author:mullan
Date:  2011-03-07 13:20 -0500
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/bc0c58d65e97

7022467: SecretKeyFactory doesn't support algorithm AES on Windows and Linux
Reviewed-by: wetmore, valeriep

! src/share/classes/javax/crypto/SecretKeyFactory.java

Changeset: 62b0337d1369
Author:mullan
Date:  2011-03-07 13:44 -0500
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/62b0337d1369

Merge




Re: Review request for 7020513 : Add com.sun.xml.internal to the package.access property in java.security

2011-03-07 Thread Rama Pulavarthi
Thanks for the review. We had to make additional changes to run the
tests.  Hopefully this is the final webrev for this issue.

Please review this new webrev which also has changes to
jdk/test/Makefile to run the tests.
http://cr.openjdk.java.net/~ramap/CR7020513-open-webrev/

thanks,
Rama Pulavarthi

On 02/25/2011 12:21 PM, Sean Mullan wrote:
 Looks good to me.

 --Sean

 On 2/25/11 1:12 PM, Rama Pulavarthi wrote:
 Please review this updated webrev that has the patch for JDK 7 repo.
 http://cr.openjdk.java.net/~ohair/openjdk7/jdk7-tl-jaxws-7020513-open/webrev/


 For background on this issue, this is not a new one. I am trying to port
 the old fixes made in jdk repo as part of earlier jax-ws integrations in
 to Open JDK 6.
 The original issue CR 6592792 was fixed in JDK 6u7 and then ported to
 Open JDK 6.  When Open JDK 6 transitioned to Hg, it was committed as
 [1]. As fix for CR 6831313
 http://monaco.sfbay.sun.com/detail.jsf?cr=6831313:update jaxws in
 OpenJDK7 to 2.1 plus bug fixes from OpenJDK 6, Only the changes in jaxws
 sources are ported to JDK 7 [2]. But, there are other changes that are
 made in jdk repo required for this fix.

 [1] http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/586feec8273d
 http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/586feec8273d.
 [2] http://hg.openjdk.java.net/jdk7/build/jaxws/rev/31822b475baa
 http://hg.openjdk.java.net/jdk7/build/jaxws/rev/31822b475baa.


 thanks,
 Rama Pulavarthi



hg: jdk7/tl/jaxp: 5 new changesets

2011-03-07 Thread lana . steuck
Changeset: a57220f22751
Author:ohair
Date:  2011-02-16 13:29 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/a57220f22751

7013964: openjdk LICENSE file needs rebranding
Reviewed-by: darcy, katleman, jjg

! LICENSE

Changeset: eab6f27131e4
Author:cl
Date:  2011-02-23 15:48 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/eab6f27131e4

Merge


Changeset: abe04c59a556
Author:cl
Date:  2011-02-24 15:15 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/abe04c59a556

Added tag jdk7-b131 for changeset eab6f27131e4

! .hgtags

Changeset: 8e1148c7911b
Author:katleman
Date:  2011-03-03 14:13 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/8e1148c7911b

Added tag jdk7-b132 for changeset abe04c59a556

! .hgtags

Changeset: b693ccf23fb7
Author:lana
Date:  2011-03-07 11:56 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxp/rev/b693ccf23fb7

Merge




hg: jdk7/tl/langtools: 7 new changesets

2011-03-07 Thread lana . steuck
Changeset: 22ea7d483794
Author:ohair
Date:  2011-02-16 13:30 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/22ea7d483794

7013964: openjdk LICENSE file needs rebranding
Reviewed-by: darcy, katleman, jjg

! LICENSE

Changeset: 67221b8643b4
Author:cl
Date:  2011-02-23 15:49 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/67221b8643b4

Merge


Changeset: 80bbd1da4a72
Author:cl
Date:  2011-02-24 15:16 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/80bbd1da4a72

Added tag jdk7-b131 for changeset 67221b8643b4

! .hgtags

Changeset: de5524670f80
Author:lana
Date:  2011-02-21 14:35 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/de5524670f80

Merge


Changeset: e3d011d59a33
Author:lana
Date:  2011-02-24 18:05 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/e3d011d59a33

Merge


Changeset: e77e98f936e8
Author:katleman
Date:  2011-03-03 14:13 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/e77e98f936e8

Added tag jdk7-b132 for changeset e3d011d59a33

! .hgtags

Changeset: b1b898c00b71
Author:lana
Date:  2011-03-07 11:37 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/b1b898c00b71

Merge




hg: jdk7/tl/jaxws: 4 new changesets

2011-03-07 Thread lana . steuck
Changeset: 9e3904866cab
Author:ohair
Date:  2011-02-16 13:29 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/9e3904866cab

7013964: openjdk LICENSE file needs rebranding
Reviewed-by: darcy, katleman, jjg

! LICENSE

Changeset: 438abc0356cd
Author:cl
Date:  2011-02-23 15:49 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/438abc0356cd

Merge


Changeset: 0e57c3272d37
Author:cl
Date:  2011-02-24 15:15 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/0e57c3272d37

Added tag jdk7-b131 for changeset 438abc0356cd

! .hgtags

Changeset: 359d0c8c00a0
Author:katleman
Date:  2011-03-03 14:13 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jaxws/rev/359d0c8c00a0

Added tag jdk7-b132 for changeset 0e57c3272d37

! .hgtags



hg: jdk7/tl/hotspot: 55 new changesets

2011-03-07 Thread lana . steuck
Changeset: cdef89d821bd
Author:ohair
Date:  2011-02-16 13:30 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/cdef89d821bd

7013964: openjdk LICENSE file needs rebranding
Reviewed-by: darcy, katleman, jjg

! LICENSE

Changeset: 0aa3b4908911
Author:cl
Date:  2011-02-23 15:48 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/0aa3b4908911

Merge


Changeset: 2015d9b41531
Author:cl
Date:  2011-02-24 15:15 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/2015d9b41531

Added tag jdk7-b131 for changeset 0aa3b4908911

! .hgtags

Changeset: f3e07ceeaed9
Author:trims
Date:  2011-02-25 11:42 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/f3e07ceeaed9

Added tag hs21-b02 for changeset e9aa2ca89ad6

! .hgtags

Changeset: 7dc5384467e0
Author:coleenp
Date:  2011-02-12 10:28 -0500
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/7dc5384467e0

7022659: errorHandler doesn't compile without precompiled headers
Summary: add proper includes in errorHandler.hpp
Reviewed-by: phh, kamg

! src/share/vm/utilities/errorReporter.hpp

Changeset: c798c277ddd1
Author:brutisso
Date:  2011-02-03 20:49 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/c798c277ddd1

7015169: GC Cause not always set
Summary: Sometimes the gc cause was not always set. This caused JStat to print 
the wrong information.
Reviewed-by: tonyp, ysr
Contributed-by: suenaga.yasum...@oss.ntt.co.jp

! src/share/vm/gc_implementation/concurrentMarkSweep/vmCMSOperations.hpp
! src/share/vm/gc_implementation/g1/vm_operations_g1.hpp
! src/share/vm/gc_implementation/parallelScavenge/vmPSOperations.cpp
! src/share/vm/gc_implementation/shared/vmGCOperations.cpp
! src/share/vm/gc_implementation/shared/vmGCOperations.hpp
! src/share/vm/gc_interface/gcCause.cpp
! src/share/vm/gc_interface/gcCause.hpp
! src/share/vm/services/heapDumper.cpp

Changeset: c5a923563727
Author:ysr
Date:  2011-02-07 22:19 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/c5a923563727

6912621: iCMS: Error: assert(_markBitMap.isMarked(addr + 1),Missing Printezis 
bit?)
Summary: Fix block_size_if_printezis_bits() so it does not expect the bits, 
only uses them when available. Fix block_size_no_stall() so it does not stall 
when the bits are missing such cases, letting the caller deal with zero size 
returns. Constant pool cache oops do not need to be unparsable or conc_unsafe 
after their klass pointer is installed. Some cosmetic clean-ups and some 
assertion checking for conc-usafety which, in the presence of class file 
redefinition, has no a-priori time boundedness, so all GCs must be able to 
safely deal with putatively conc-unsafe objects in a stop-world pause.
Reviewed-by: jmasa, johnc

! src/share/vm/classfile/classFileParser.cpp
! 
src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp
! 
src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepGeneration.cpp
! src/share/vm/gc_interface/collectedHeap.cpp
! src/share/vm/interpreter/rewriter.cpp
! src/share/vm/memory/oopFactory.cpp
! src/share/vm/memory/oopFactory.hpp
! src/share/vm/oops/constantPoolKlass.cpp
! src/share/vm/oops/cpCacheKlass.cpp
! src/share/vm/oops/cpCacheKlass.hpp
! src/share/vm/oops/cpCacheOop.hpp
! src/share/vm/oops/methodOop.cpp
! src/share/vm/oops/methodOop.hpp
! src/share/vm/oops/oop.hpp
! src/share/vm/prims/jvmtiRedefineClasses.cpp
! src/share/vm/prims/methodHandleWalk.cpp

Changeset: e5383553fd4e
Author:stefank
Date:  2011-02-08 12:33 +0100
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/e5383553fd4e

7014851: Remove unused parallel compaction code
Summary: Removed.
Reviewed-by: jcoomes, brutisso

! src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.hpp
! src/share/vm/oops/arrayKlassKlass.cpp
! src/share/vm/oops/compiledICHolderKlass.cpp
! src/share/vm/oops/constMethodKlass.cpp
! src/share/vm/oops/constantPoolKlass.cpp
! src/share/vm/oops/cpCacheKlass.cpp
! src/share/vm/oops/cpCacheOop.cpp
! src/share/vm/oops/cpCacheOop.hpp
! src/share/vm/oops/instanceKlass.cpp
! src/share/vm/oops/instanceKlass.hpp
! src/share/vm/oops/instanceKlassKlass.cpp
! src/share/vm/oops/instanceRefKlass.cpp
! src/share/vm/oops/klassKlass.cpp
! src/share/vm/oops/klassPS.hpp
! src/share/vm/oops/klassVtable.cpp
! src/share/vm/oops/klassVtable.hpp
! src/share/vm/oops/methodDataKlass.cpp
! src/share/vm/oops/methodDataOop.cpp
! src/share/vm/oops/methodDataOop.hpp
! src/share/vm/oops/methodKlass.cpp
! src/share/vm/oops/objArrayKlass.cpp
! src/share/vm/oops/objArrayKlassKlass.cpp
! src/share/vm/oops/oop.hpp
! src/share/vm/oops/oop.pcgc.inline.hpp
! src/share/vm/oops/typeArrayKlass.cpp

Changeset: 59e20a452a2a
Author:johnc
Date:  2011-02-09 09:43 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/hotspot/rev/59e20a452a2a

7017008: G1: Turn on compressed oops by default.
Summary: Normally compressed oops is enabled when the maximum 

Re: Review request for 7020513 : Add com.sun.xml.internal to the package.access property in java.security

2011-03-07 Thread Kelly O'Hair
Looks good to me.

-kto

On Mar 7, 2011, at 11:39 AM, Rama Pulavarthi wrote:

 Thanks for the review. We had to make additional changes to run the
 tests.  Hopefully this is the final webrev for this issue.
 
 Please review this new webrev which also has changes to
 jdk/test/Makefile to run the tests.
 http://cr.openjdk.java.net/~ramap/CR7020513-open-webrev/
 
 thanks,
 Rama Pulavarthi
 
 On 02/25/2011 12:21 PM, Sean Mullan wrote:
 Looks good to me.
 
 --Sean
 
 On 2/25/11 1:12 PM, Rama Pulavarthi wrote:
 Please review this updated webrev that has the patch for JDK 7 repo.
 http://cr.openjdk.java.net/~ohair/openjdk7/jdk7-tl-jaxws-7020513-open/webrev/
 
 
 For background on this issue, this is not a new one. I am trying to port
 the old fixes made in jdk repo as part of earlier jax-ws integrations in
 to Open JDK 6.
 The original issue CR 6592792 was fixed in JDK 6u7 and then ported to
 Open JDK 6.  When Open JDK 6 transitioned to Hg, it was committed as
 [1]. As fix for CR 6831313
 http://monaco.sfbay.sun.com/detail.jsf?cr=6831313:update jaxws in
 OpenJDK7 to 2.1 plus bug fixes from OpenJDK 6, Only the changes in jaxws
 sources are ported to JDK 7 [2]. But, there are other changes that are
 made in jdk repo required for this fix.
 
 [1] http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/586feec8273d
 http://hg.openjdk.java.net/jdk6/jdk6/jdk/rev/586feec8273d.
 [2] http://hg.openjdk.java.net/jdk7/build/jaxws/rev/31822b475baa
 http://hg.openjdk.java.net/jdk7/build/jaxws/rev/31822b475baa.
 
 
 thanks,
 Rama Pulavarthi
 



hg: jdk7/tl/jdk: 49 new changesets

2011-03-07 Thread lana . steuck
Changeset: 0355c60c2da4
Author:ohair
Date:  2011-02-16 13:29 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/0355c60c2da4

7013964: openjdk LICENSE file needs rebranding
Reviewed-by: darcy, katleman, jjg

! LICENSE

Changeset: 9b2631288894
Author:ohair
Date:  2011-02-16 14:33 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/9b2631288894

7010594: Add /SAFESEH to links on windows to verify safe exceptions
Reviewed-by: alanb

! make/common/Defs-windows.gmk
! make/common/shared/Defs-windows.gmk

Changeset: 5e09deee1967
Author:andrew
Date:  2011-02-23 17:10 +
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/5e09deee1967

7021314: Build should not install javaws man page
Summary: Only install javaws.1 when not building OpenJDK
Reviewed-by: alanb, ohair

! make/common/Release.gmk

Changeset: 8ac52c85f9e9
Author:cl
Date:  2011-02-23 15:49 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/8ac52c85f9e9

Merge


Changeset: 11c9a066a5a4
Author:cl
Date:  2011-02-24 15:16 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/11c9a066a5a4

Added tag jdk7-b131 for changeset 8ac52c85f9e9

! .hgtags

Changeset: d7de46ec011b
Author:jrose
Date:  2011-02-11 01:26 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/d7de46ec011b

7013417: JSR 292 needs to support variadic method handle calls
Summary: Implement MH.asVarargsCollector, etc., and remove withTypeHandler.
Reviewed-by: twisti

! src/share/classes/java/dyn/MethodHandle.java
! src/share/classes/java/dyn/MethodHandles.java
! src/share/classes/java/dyn/package-info.java
! src/share/classes/sun/dyn/AdapterMethodHandle.java
! src/share/classes/sun/dyn/CallSiteImpl.java
! src/share/classes/sun/dyn/InvokeGeneric.java
! src/share/classes/sun/dyn/Invokers.java
! src/share/classes/sun/dyn/MethodHandleImpl.java
! src/share/classes/sun/dyn/MethodTypeImpl.java
! test/java/dyn/InvokeDynamicPrintArgs.java
! test/java/dyn/JavaDocExamplesTest.java
! test/java/dyn/MethodHandlesTest.java
! test/java/dyn/indify/Indify.java

Changeset: c86c60ad8822
Author:jrose
Date:  2011-02-11 01:26 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/c86c60ad8822

7012650: implement JSR 292 EG adjustments through January 2010
Summary: misc. EG changes and polishes (excluding 7013417)
Reviewed-by: twisti

! src/share/classes/java/dyn/CallSite.java
! src/share/classes/java/dyn/ClassValue.java
! src/share/classes/java/dyn/ConstantCallSite.java
! src/share/classes/java/dyn/InvokeDynamicBootstrapError.java
! src/share/classes/java/dyn/Linkage.java
! src/share/classes/java/dyn/MethodHandle.java
! src/share/classes/java/dyn/MethodHandles.java
! src/share/classes/java/dyn/MethodType.java
! src/share/classes/java/dyn/MutableCallSite.java
+ src/share/classes/java/dyn/SwitchPoint.java
- src/share/classes/java/dyn/Switcher.java
! src/share/classes/java/dyn/VolatileCallSite.java
! src/share/classes/java/dyn/WrongMethodTypeException.java
! src/share/classes/java/dyn/package-info.java
! src/share/classes/sun/dyn/AdapterMethodHandle.java
! src/share/classes/sun/dyn/FromGeneric.java
! src/share/classes/sun/dyn/InvokeGeneric.java
! src/share/classes/sun/dyn/Invokers.java
! src/share/classes/sun/dyn/MethodHandleImpl.java
! src/share/classes/sun/dyn/ToGeneric.java
+ src/share/classes/sun/dyn/WrapperInstance.java
! test/java/dyn/InvokeGenericTest.java
! test/java/dyn/JavaDocExamplesTest.java
! test/java/dyn/MethodHandlesTest.java

Changeset: a2241b109aa1
Author:jrose
Date:  2011-02-11 01:26 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/a2241b109aa1

7013730: JSR 292 reflective operations should report errors with standard 
exception types
Summary: remove NoAccessException, replace it by ReflectiveOperationException 
subtypes; adjust javadoc of exceptions
Reviewed-by: twisti

! src/share/classes/java/dyn/CallSite.java
! src/share/classes/java/dyn/Linkage.java
! src/share/classes/java/dyn/MethodHandles.java
- src/share/classes/java/dyn/NoAccessException.java
! src/share/classes/sun/dyn/CallSiteImpl.java
! src/share/classes/sun/dyn/FilterGeneric.java
! src/share/classes/sun/dyn/FilterOneArgument.java
! src/share/classes/sun/dyn/FromGeneric.java
! src/share/classes/sun/dyn/InvokeGeneric.java
! src/share/classes/sun/dyn/Invokers.java
! src/share/classes/sun/dyn/MemberName.java
! src/share/classes/sun/dyn/MethodHandleImpl.java
! src/share/classes/sun/dyn/MethodHandleNatives.java
! src/share/classes/sun/dyn/SpreadGeneric.java
! src/share/classes/sun/dyn/ToGeneric.java
! src/share/classes/sun/dyn/util/ValueConversions.java
! src/share/classes/sun/dyn/util/VerifyAccess.java
! test/java/dyn/InvokeGenericTest.java
! test/java/dyn/JavaDocExamplesTest.java
! test/java/dyn/MethodHandlesTest.java

Changeset: 5e4a41d0fccd
Author:jrose
Date:  2011-02-15 00:16 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/5e4a41d0fccd

7016261: JSR 292 MethodType objects should be serializable

hg: jdk7/tl/langtools: 6980021: javac should document @file command line option

2011-03-07 Thread jonathan . gibbons
Changeset: cb9493a80341
Author:jjg
Date:  2011-03-07 13:45 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/cb9493a80341

6980021: javac should document @file command line option
Reviewed-by: mcimadamore

! src/share/classes/com/sun/tools/javac/main/OptionName.java
! src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java
! src/share/classes/com/sun/tools/javac/resources/javac.properties
! test/tools/javac/diags/CheckResourceKeys.java



hg: jdk7/tl/jdk: 6994008: PKCS11 should support RSA and RSA/ECB/NoPadding ciphers

2011-03-07 Thread valerie . peng
Changeset: a52da0bada39
Author:valeriep
Date:  2011-03-07 14:14 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/jdk/rev/a52da0bada39

6994008: PKCS11 should support RSA and RSA/ECB/NoPadding ciphers
Summary: Add support for RSA_X_509 mechanism and aliasing of RSA to 
RSA/ECB/PKCS1Padding.
Reviewed-by: wetmore

! src/share/classes/sun/security/pkcs11/P11RSACipher.java
! src/share/classes/sun/security/pkcs11/SunPKCS11.java
! test/sun/security/pkcs11/Cipher/TestRSACipher.java
! test/sun/security/pkcs11/Cipher/TestRSACipherWrap.java
+ test/sun/security/pkcs11/Cipher/TestRawRSACipher.java



Re: Code Review for 7001933: Deadlock in java.lang.classloader.getPackage()

2011-03-07 Thread Valerie (Yu-Ching) Peng


It could be that they have custom classloader which isn't parallel 
capable. So, this will still occur w/ jdk7 if this is the case.
We'll need to get some more information on the setup to reproduce the 
issue. Given the time constraint, I'll file a bug to keep track of this 
test case creation, but this will likely not be done for jdk7.


Thanks for all the comments/feedbacks,
Valerie

On 02/26/11 01:40 AM, Alan Bateman wrote:

Valerie (Yu-Ching) Peng wrote:

David,

Thanks for the comments. I've updated the webrev accordingly at:
http://cr.openjdk.java.net/~valeriep/7001933/webrev.01/

In the case of a race condition, we'll just return the earlier 
defined package object, i.e. pkg2 in your code sample.
Or, we could also get rid of this code block altogether, then there 
shouldn't be a race condition. However, this means that we'll  call 
into the parent loader for the packages that they defined which 
implies some performance cost.


I think the updated changes are okay/harmless but it's not completely 
clear to me that the specific deadlock that this bug is about can 
actually happen in jdk7 (because AppClassLoader is parallel capable).


It would be great to put in time to develop a test to demonstrate the 
original issue, even if can't be an automated regression test (I've no 
doubt that it would need to run many iterations to duplicate).


I also think we should submit a bug to re-examine how java.net.URL 
behaves when java.protocol.handler.pkgs is set. Minimally I think it 
needs to be clearer on the initiating loaders used when attempting to 
load the protocol handler. In addition it's not clear to me that it 
should fallback to the system class loader for the file protocol 
handler as that is required early in the startup to define the system 
package.


-Alan




hg: jdk7/tl/langtools: 7021927: javac: regression in performance

2011-03-07 Thread kumar . x . srinivasan
Changeset: 6970d9fb8e02
Author:ksrini
Date:  2011-03-07 17:39 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/6970d9fb8e02

7021927: javac: regression in performance
Reviewed-by: jjg

! src/share/classes/com/sun/tools/javac/file/JavacFileManager.java
! src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java
! src/share/classes/com/sun/tools/javac/util/Options.java
! test/tools/javac/6508981/TestInferBinaryName.java
! test/tools/javac/api/6411310/Test.java
! test/tools/javac/api/T6838467.java
! test/tools/javac/api/T6877206.java
+ test/tools/javac/file/zip/T6836682.java
+ test/tools/javac/file/zip/T6865530.java
+ test/tools/javac/file/zip/Utils.java