hg: jdk7/tl/corba: 2 new changesets

2010-12-02 Thread abhi . saha
Changeset: 6fe70c295e96
Author:skoppar
Date:  2010-11-21 21:47 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/corba/rev/6fe70c295e96

6980681: CORBA deadlock in Java SE beleived to be related to CR 6238477
Summary: Also reviewed by ken.cavana...@oracle.com
Reviewed-by: poonam

! src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java

Changeset: d2049cfdf02b
Author:asaha
Date:  2010-12-01 16:46 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/corba/rev/d2049cfdf02b

Merge

! src/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java



hg: jdk7/tl/langtools: 2 new changesets

2010-12-02 Thread jonathan . gibbons
Changeset: 7e3e9f6d013f
Author:jjg
Date:  2010-12-02 16:37 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/7e3e9f6d013f

7004029: intermittent failures compiling pack200
Summary: remove "bogus" entries from star-import scopes
Reviewed-by: mcimadamore
Contributed-by: per.both...@oracle.com

! src/share/classes/com/sun/tools/javac/code/Scope.java
! src/share/classes/com/sun/tools/javac/comp/Enter.java
! src/share/classes/com/sun/tools/javac/comp/MemberEnter.java
! src/share/classes/com/sun/tools/javac/tree/JCTree.java
+ test/tools/javac/scope/HashCollisionTest.java
+ test/tools/javac/scope/StarImportTest.java

Changeset: 28566c763dad
Author:jjg
Date:  2010-12-02 16:38 -0800
URL:   http://hg.openjdk.java.net/jdk7/tl/langtools/rev/28566c763dad

Merge

- src/share/classes/com/sun/tools/doclets/formats/html/StylesheetWriter.java
- 
src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java