@@ -1136,12 +1129,13 @@ final class StringHelper
* argument.
*/
static boolean regionMatches(String _this, boolean ignoreCase, int toffset,
- String other, int ooffset, int len) {
+ String other, int ooffset, int len) {
int to = toffset;
int po = ooffset;
// Note: toffset, ooffset, or len might be near -1>>>1.
- if ((ooffset < 0) || (toffset < 0) || (toffset > (long)_this.length() - len) ||
- (ooffset > (long)other.length() - len)) {
+ if ((ooffset < 0) || (toffset < 0)
+ || (toffset > (long)_this.length() - len)
+ || (ooffset > (long)other.length() - len)) {
return false;
}
while (len-- > 0) {
@@ -1294,13 +1288,12 @@ final class StringHelper
*/
private static int indexOfSupplementary(cli.System.String _this, int ch, int fromIndex) {
if (Character.isValidCodePoint(ch)) {
- final int offset = 0;
final char hi = Character.highSurrogate(ch);
final char lo = Character.lowSurrogate(ch);
- final int max = offset + _this.get_Length() - 1;
- for (int i = offset + fromIndex; i < max; i++) {
+ final int max = _this.get_Length() - 1;
+ for (int i = fromIndex; i < max; i++) {
if (_this.get_Chars(i) == hi && _this.get_Chars(i+1) == lo) {
- return i - offset;
+ return i;
}
}
}
@@ -1372,10 +1365,8 @@ final class StringHelper
if (ch < Character.MIN_SUPPLEMENTARY_CODE_POINT) {
// handle most cases here (ch is a BMP code point or a
// negative value (invalid code point))
- final int count = _this.get_Length();
- final int offset = 0;
- int i = offset + Math.min(fromIndex, count - 1);
- for (; i >= offset ; i--) {
+ int i = Math.min(fromIndex, _this.get_Length() - 1);
+ for (; i >= 0; i--) {
if (_this.get_Chars(i) == ch) {
return i;
}
@@ -1391,14 +1382,12 @@ final class StringHelper
*/
private static int lastIndexOfSupplementary(cli.System.String _this, int ch, int fromIndex) {
if (Character.isValidCodePoint(ch)) {
- final int count = _this.get_Length();
- final int offset = 0;
char hi = Character.highSurrogate(ch);
char lo = Character.lowSurrogate(ch);
- int i = offset + Math.min(fromIndex, count - 2);
- for (; i >= offset; i--) {
+ int i = Math.min(fromIndex, _this.get_Length() - 2);
+ for (; i >= 0; i--) {
if (_this.get_Chars(i) == hi && _this.get_Chars(i+1) == lo) {
- return i - offset;
+ return i;
}
}
}
@@ -1665,18 +1654,18 @@ final class StringHelper
* endIndex.
*/
static String substring(cli.System.String _this, int beginIndex, int endIndex) {
- int count = _this.get_Length();
if (beginIndex < 0) {
throw new StringIndexOutOfBoundsException(beginIndex);
}
- if (endIndex > count) {
+ if (endIndex > _this.get_Length()) {
throw new StringIndexOutOfBoundsException(endIndex);
}
- if (beginIndex > endIndex) {
- throw new StringIndexOutOfBoundsException(endIndex - beginIndex);
+ int subLen = endIndex - beginIndex;
+ if (subLen < 0) {
+ throw new StringIndexOutOfBoundsException(subLen);
}
- return ((beginIndex == 0) && (endIndex == count)) ? (String)(Object)_this :
- _this.Substring(beginIndex, endIndex - beginIndex);
+ return ((beginIndex == 0) && (endIndex == _this.get_Length())) ? (String)(Object)_this
+ : _this.Substring(beginIndex, subLen);
}
/**
@@ -1756,7 +1745,7 @@ final class StringHelper
buf[i] = (c == oldChar) ? newChar : c;
i++;
}
- return new String(0, len, buf);
+ return new String(buf, true);
}
}
return _this;
@@ -1876,11 +1865,11 @@ final class StringHelper
*/
static String[] split(String _this, String regex, int limit) {
/* fastpath if the regex is a
- (1)one-char String and this character is not one of the
- RegEx's meta characters ".$|()[{^?*+\\", or
- (2)two-char String and the first char is the backslash and
- the second is not the ascii digit or ascii letter.
- */
+ (1)one-char String and this character is not one of the
+ RegEx's meta characters ".$|()[{^?*+\\", or
+ (2)two-char String and the first char is the backslash and
+ the second is not the ascii digit or ascii letter.
+ */
char ch = 0;
if (((regex.length() == 1 &&
".$|()[{^?*+\\".indexOf(ch = regex.charAt(0)) == -1) ||
@@ -1892,7 +1881,6 @@ final class StringHelper
(ch < Character.MIN_HIGH_SURROGATE ||
ch > Character.MAX_LOW_SURROGATE))
{
- int count = _this.length();
int off = 0;
int next = 0;
boolean limited = limit > 0;
@@ -1903,23 +1891,23 @@ final class StringHelper
off = next + 1;
} else { // last one
//assert (list.size() == limit - 1);
- list.add(_this.substring(off, count));
- off = count;
+ list.add(_this.substring(off, _this.length()));
+ off = _this.length();
break;
}
}
// If no match was found, return this
if (off == 0)
- return new String[] { _this };
+ return new String[]{_this};
// Add remaining segment
if (!limited || list.size() < limit)
- list.add(_this.substring(off, count));
+ list.add(_this.substring(off, _this.length()));
// Construct result
int resultSize = list.size();
if (limit == 0)
- while (resultSize > 0 && list.get(resultSize-1).length() == 0)
+ while (resultSize > 0 && list.get(resultSize - 1).length() == 0)
resultSize--;
String[] result = new String[resultSize];
return list.subList(0, resultSize).toArray(result);
@@ -1984,15 +1972,15 @@ final class StringHelper
throw new NullPointerException();
}
- final int count = _this.length();
- int firstUpper;
+ int firstUpper;
+ final int len = _this.length();
/* Now check if there are any characters that need to be changed. */
scan: {
- for (firstUpper = 0 ; firstUpper < count; ) {
+ for (firstUpper = 0 ; firstUpper < len; ) {
char c = _this.charAt(firstUpper);
- if ((c >= Character.MIN_HIGH_SURROGATE) &&
- (c <= Character.MAX_HIGH_SURROGATE)) {
+ if ((c >= Character.MIN_HIGH_SURROGATE)
+ && (c <= Character.MAX_HIGH_SURROGATE)) {
int supplChar = _this.codePointAt(firstUpper);
if (supplChar != Character.toLowerCase(supplChar)) {
break scan;
@@ -2008,24 +1996,24 @@ final class StringHelper
return _this;
}
- char[] result = new char[count];
- int resultOffset = 0; /* result may grow, so i+resultOffset
- * is the write location in result */
+ char[] result = new char[len];
+ int resultOffset = 0; /* result may grow, so i+resultOffset
+ * is the write location in result */
/* Just copy the first few lowerCase characters. */
_this.getChars(0, firstUpper, result, 0);
String lang = locale.getLanguage();
boolean localeDependent =
- (lang == "tr" || lang == "az" || lang == "lt");
+ (lang == "tr" || lang == "az" || lang == "lt");
char[] lowerCharArray;
int lowerChar;
int srcChar;
int srcCount;
- for (int i = firstUpper; i < count; i += srcCount) {
+ for (int i = firstUpper; i < len; i += srcCount) {
srcChar = (int)_this.charAt(i);
- if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
- (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
+ if ((char)srcChar >= Character.MIN_HIGH_SURROGATE
+ && (char)srcChar <= Character.MAX_HIGH_SURROGATE) {
srcChar = _this.codePointAt(i);
srcCount = Character.charCount(srcChar);
} else {
@@ -2038,16 +2026,16 @@ final class StringHelper
} else {
lowerChar = Character.toLowerCase(srcChar);
}
- if ((lowerChar == Character.ERROR) ||
- (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
+ if ((lowerChar == Character.ERROR)
+ || (lowerChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
if (lowerChar == Character.ERROR) {
- if (!localeDependent && srcChar == '\u0130') {
- lowerCharArray =
- ConditionalSpecialCasing.toLowerCaseCharArray(_this, i, Locale.ENGLISH);
- } else {
+ if (!localeDependent && srcChar == '\u0130') {
lowerCharArray =
- ConditionalSpecialCasing.toLowerCaseCharArray(_this, i, locale);
- }
+ ConditionalSpecialCasing.toLowerCaseCharArray(_this, i, Locale.ENGLISH);
+ } else {
+ lowerCharArray =
+ ConditionalSpecialCasing.toLowerCaseCharArray(_this, i, locale);
+ }
} else if (srcCount == 2) {
resultOffset += Character.toChars(lowerChar, result, i + resultOffset) - srcCount;
continue;
@@ -2059,19 +2047,18 @@ final class StringHelper
int mapLen = lowerCharArray.length;
if (mapLen > srcCount) {
char[] result2 = new char[result.length + mapLen - srcCount];
- System.arraycopy(result, 0, result2, 0,
- i + resultOffset);
+ System.arraycopy(result, 0, result2, 0, i + resultOffset);
result = result2;
}
- for (int x=0; x= Character.MIN_HIGH_SURROGATE) &&
- (c <= Character.MAX_HIGH_SURROGATE)) {
+ if ((c >= Character.MIN_HIGH_SURROGATE)
+ && (c <= Character.MAX_HIGH_SURROGATE)) {
c = _this.codePointAt(firstLower);
srcCount = Character.charCount(c);
} else {
srcCount = 1;
}
int upperCaseChar = Character.toUpperCaseEx(c);
- if ((upperCaseChar == Character.ERROR) ||
- (c != upperCaseChar)) {
+ if ((upperCaseChar == Character.ERROR)
+ || (c != upperCaseChar)) {
break scan;
}
firstLower += srcCount;
@@ -2175,21 +2162,21 @@ final class StringHelper
return _this;
}
- char[] result = new char[count]; /* may grow */
- int resultOffset = 0; /* result may grow, so i+resultOffset
- * is the write location in result */
+ char[] result = new char[len]; /* may grow */
+ int resultOffset = 0; /* result may grow, so i+resultOffset
+ * is the write location in result */
/* Just copy the first few upperCase characters. */
_this.getChars(0, firstLower, result, 0);
String lang = locale.getLanguage();
boolean localeDependent =
- (lang == "tr" || lang == "az" || lang == "lt");
+ (lang == "tr" || lang == "az" || lang == "lt");
char[] upperCharArray;
int upperChar;
int srcChar;
int srcCount;
- for (int i = firstLower; i < count; i += srcCount) {
+ for (int i = firstLower; i < len; i += srcCount) {
srcChar = (int)_this.charAt(i);
if ((char)srcChar >= Character.MIN_HIGH_SURROGATE &&
(char)srcChar <= Character.MAX_HIGH_SURROGATE) {
@@ -2203,12 +2190,12 @@ final class StringHelper
} else {
upperChar = Character.toUpperCaseEx(srcChar);
}
- if ((upperChar == Character.ERROR) ||
- (upperChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
+ if ((upperChar == Character.ERROR)
+ || (upperChar >= Character.MIN_SUPPLEMENTARY_CODE_POINT)) {
if (upperChar == Character.ERROR) {
if (localeDependent) {
upperCharArray =
- ConditionalSpecialCasing.toUpperCaseCharArray(_this, i, locale);
+ ConditionalSpecialCasing.toUpperCaseCharArray(_this, i, locale);
} else {
upperCharArray = Character.toUpperCaseCharArray(srcChar);
}
@@ -2223,19 +2210,18 @@ final class StringHelper
int mapLen = upperCharArray.length;
if (mapLen > srcCount) {
char[] result2 = new char[result.length + mapLen - srcCount];
- System.arraycopy(result, 0, result2, 0,
- i + resultOffset);
+ System.arraycopy(result, 0, result2, 0, i + resultOffset);
result = result2;
}
- for (int x=0; x 0) || (len < count)) ? _this.substring(st, len) : _this;
+ return ((st > 0) || (len < _this.length())) ? _this.substring(st, len) : _this;
}
/**
@@ -2468,7 +2453,7 @@ final class StringHelper
* character array.
*/
public static String copyValueOf(char data[]) {
- return copyValueOf(data, 0, data.length);
+ return new String(data);
}
/**
@@ -2538,4 +2523,70 @@ final class StringHelper
public static String valueOf(double d) {
return Double.toString(d);
}
+
+ /**
+ * Seed value used for each alternative hash calculated.
+ */
+ private static final int HASHING_SEED;
+
+ static {
+ long nanos = System.nanoTime();
+ long now = System.currentTimeMillis();
+ int SEED_MATERIAL[] = {
+ System.identityHashCode(String.class),
+ System.identityHashCode(System.class),
+ (int) (nanos >>> 32),
+ (int) nanos,
+ (int) (now >>> 32),
+ (int) now,
+ (int) (System.nanoTime() >>> 2)
+ };
+
+ // Use murmur3 to scramble the seeding material.
+ // Inline implementation to avoid loading classes
+ int h1 = 0;
+
+ // body
+ for (int k1 : SEED_MATERIAL) {
+ k1 *= 0xcc9e2d51;
+ k1 = (k1 << 15) | (k1 >>> 17);
+ k1 *= 0x1b873593;
+
+ h1 ^= k1;
+ h1 = (h1 << 13) | (h1 >>> 19);
+ h1 = h1 * 5 + 0xe6546b64;
+ }
+
+ // tail (always empty, as body is always 32-bit chunks)
+
+ // finalization
+
+ h1 ^= SEED_MATERIAL.length * 4;
+
+ // finalization mix force all bits of a hash block to avalanche
+ h1 ^= h1 >>> 16;
+ h1 *= 0x85ebca6b;
+ h1 ^= h1 >>> 13;
+ h1 *= 0xc2b2ae35;
+ h1 ^= h1 >>> 16;
+
+ HASHING_SEED = h1;
+ }
+
+ /**
+ * Calculates a 32-bit hash value for this string.
+ *
+ * @return a 32-bit hash value for this string.
+ */
+ static int hash32(String _this) {
+ // [IKVM] We don't bother with murmur32 and just use the .NET hash code
+ // and hope that it is good enough. We xor with HASHING_SEED to avoid
+ // returning predictable values (this does not help against DoS attacks,
+ // but it will surface constant hash code dependencies).
+ // If truly randomized string hashes are required (to protect against
+ // DoS) the .NET 4.5
+ // app.config setting can be used.
+ return HASHING_SEED ^ ((cli.System.String)(Object)_this).GetHashCode();
+ }
+
}
diff --git a/openjdk/java/lang/invoke/MethodHandles.java b/openjdk/java/lang/invoke/MethodHandles.java
index 632bb3e9..ac57f5e1 100644
--- a/openjdk/java/lang/invoke/MethodHandles.java
+++ b/openjdk/java/lang/invoke/MethodHandles.java
@@ -464,8 +464,8 @@ public class MethodHandles {
&& !VerifyAccess.isSamePackageMember(this.lookupClass, requestedLookupClass)) {
newModes &= ~PRIVATE;
}
- if (newModes == PUBLIC
- && !VerifyAccess.isClassAccessible(requestedLookupClass, this.lookupClass)) {
+ if ((newModes & PUBLIC) != 0
+ && !VerifyAccess.isClassAccessible(requestedLookupClass, this.lookupClass, allowedModes)) {
// The requested class it not accessible from the lookup class.
// No permissions.
newModes = 0;
@@ -543,13 +543,17 @@ public class MethodHandles {
}
}
- // call this from an entry point method in Lookup with extraFrames=0.
- private static Class getCallerClassAtEntryPoint() {
+ /* Obtain the external caller class, when called from Lookup. or a first-level subroutine. */
+ private static Class getCallerClassAtEntryPoint(boolean inSubroutine) {
final int CALLER_DEPTH = 4;
+ // Stack for the constructor entry point (inSubroutine=false):
// 0: Reflection.getCC, 1: getCallerClassAtEntryPoint,
// 2: Lookup., 3: MethodHandles.*, 4: caller
+ // The stack is slightly different for a subroutine of a Lookup.find* method:
+ // 2: Lookup.*, 3: Lookup.find*.*, 4: caller
// Note: This should be the only use of getCallerClass in this file.
- assert(Reflection.getCallerClass(CALLER_DEPTH-1) == MethodHandles.class);
+ assert(Reflection.getCallerClass(CALLER_DEPTH-2) == Lookup.class);
+ assert(Reflection.getCallerClass(CALLER_DEPTH-1) == (inSubroutine ? Lookup.class : MethodHandles.class));
return Reflection.getCallerClass(CALLER_DEPTH);
}
@@ -1089,7 +1093,7 @@ return mh1;
void checkSymbolicClass(Class refc) throws IllegalAccessException {
Class caller = lookupClassOrNull();
- if (caller != null && !VerifyAccess.isClassAccessible(refc, caller))
+ if (caller != null && !VerifyAccess.isClassAccessible(refc, caller, allowedModes))
throw new MemberName(refc).makeAccessException("symbolic reference class is not public", this);
}
@@ -1104,7 +1108,13 @@ return mh1;
// Step 1:
smgr.checkMemberAccess(refc, Member.PUBLIC);
// Step 2:
- if (!VerifyAccess.classLoaderIsAncestor(lookupClass, refc))
+ Class callerClass = ((allowedModes & PRIVATE) != 0
+ ? lookupClass // for strong access modes, no extra check
+ // next line does stack walk magic; do not refactor:
+ : getCallerClassAtEntryPoint(true));
+ if (!VerifyAccess.classLoaderIsAncestor(lookupClass, refc) ||
+ (callerClass != lookupClass &&
+ !VerifyAccess.classLoaderIsAncestor(callerClass, refc)))
smgr.checkPackageAccess(VerifyAccess.getPackageName(refc));
// Step 3:
if (m.isPublic()) return;
@@ -1155,9 +1165,10 @@ return mh1;
int requestedModes = fixmods(mods); // adjust 0 => PACKAGE
if ((requestedModes & allowedModes) != 0
&& VerifyAccess.isMemberAccessible(refc, m.getDeclaringClass(),
- mods, lookupClass()))
+ mods, lookupClass(), allowedModes))
return;
if (((requestedModes & ~allowedModes) & PROTECTED) != 0
+ && (allowedModes & PACKAGE) != 0
&& VerifyAccess.isSamePackage(m.getDeclaringClass(), lookupClass()))
// Protected members can also be checked as if they were package-private.
return;
@@ -1172,9 +1183,9 @@ return mh1;
(defc == refc ||
Modifier.isPublic(refc.getModifiers())));
if (!classOK && (allowedModes & PACKAGE) != 0) {
- classOK = (VerifyAccess.isClassAccessible(defc, lookupClass()) &&
+ classOK = (VerifyAccess.isClassAccessible(defc, lookupClass(), ALL_MODES) &&
(defc == refc ||
- VerifyAccess.isClassAccessible(refc, lookupClass())));
+ VerifyAccess.isClassAccessible(refc, lookupClass(), ALL_MODES)));
}
if (!classOK)
return "class is not public";
diff --git a/openjdk/openjdk.build b/openjdk/openjdk.build
index 8167283d..28606277 100644
--- a/openjdk/openjdk.build
+++ b/openjdk/openjdk.build
@@ -3,8 +3,8 @@
-
-
+
+
diff --git a/openjdk/response.txt b/openjdk/response.txt
index 5dfed333..1cd94262 100644
--- a/openjdk/response.txt
+++ b/openjdk/response.txt
@@ -171,7 +171,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Corba.dll
- -baseaddress:0x56C60000
+ -baseaddress:0x56C90000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/corba/*
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/cosnaming/jndiprovider.properties
@OPENJDK7@/build/linux-amd64/impsrc/com/sun/corba/se/impl/activation/*.class
@@ -289,7 +289,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.API.dll
- -baseaddress:0x572C0000
+ -baseaddress:0x572F0000
@OPENJDK7@/build/linux-amd64/impsrc/javax/xml/*.class
@OPENJDK7@/build/linux-amd64/impsrc/javax/xml/datatype/*.class
@OPENJDK7@/build/linux-amd64/impsrc/javax/xml/namespace/*.class
@@ -322,7 +322,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.XPath.dll
- -baseaddress:0x57380000
+ -baseaddress:0x573B0000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xalan/internal/res/*
@OPENJDK7@/build/linux-amd64/impsrc/com/sun/org/apache/xalan/internal/extensions/*.class
@OPENJDK7@/build/linux-amd64/impsrc/com/sun/org/apache/xalan/internal/res/*.class
@@ -408,7 +408,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.Transform.dll
- -baseaddress:0x57EF0000
+ -baseaddress:0x57EC0000
@OPENJDK7@/build/linux-amd64/impsrc/com/sun/java_cup/internal/runtime/*.class
@OPENJDK7@/build/linux-amd64/impsrc/com/sun/org/apache/bcel/internal/*.class
@OPENJDK7@/build/linux-amd64/impsrc/com/sun/org/apache/bcel/internal/classfile/*.class
@@ -432,7 +432,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.Bind.dll
- -baseaddress:0x58370000
+ -baseaddress:0x58310000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/javax/xml/bind/*
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/bind/*
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/fastinfoset/*
@@ -491,7 +491,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.WebServices.dll
- -baseaddress:0x58700000
+ -baseaddress:0x586A0000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/messaging/*
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/xml/internal/ws/*
@OPENJDK7@/build/linux-amd64/impsrc/com/sun/org/glassfish/external/amx/*.class
@@ -611,7 +611,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.XML.Crypto.dll
- -baseaddress:0x58C70000
+ -baseaddress:0x58C10000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/org/apache/xml/internal/security/*
@OPENJDK7@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/*.class
@OPENJDK7@/jdk/src/share/classes/com/sun/org/apache/xml/internal/security/algorithms/*.class
@@ -647,7 +647,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.SwingAWT.dll
- -baseaddress:0x58DC0000
+ -baseaddress:0x58D60000
-remap:swingawt.xml
-resource:META-INF/services/sun.java2d.pipe.RenderingEngine=resources/META-INF/services/sun.java2d.pipe.RenderingEngine
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/META-INF/services/sun.java2d.cmm.PCMM
@@ -747,7 +747,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Charsets.dll
- -baseaddress:0x59FC0000
+ -baseaddress:0x59F60000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/charsets.jar/sun/nio/cs/ext/sjis0213.dat
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/charsets.jar/META-INF/services/java.nio.charset.spi.CharsetProvider
@OPENJDK7@/build/linux-amd64/gensrc/sun/nio/cs/ext/*.class
@@ -756,7 +756,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Util.dll
- -baseaddress:0x5A650000
+ -baseaddress:0x5A5F0000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/java/util/jar/pack/intrinsic.properties
-resource:META-INF/services/java.nio.file.spi.FileSystemProvider=@OPENJDK7@/jdk/src/share/demo/nio/zipfs/src/META-INF/services/java.nio.file.spi.FileSystemProvider
java/util/zip/*.class
@@ -777,7 +777,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Text.dll
- -baseaddress:0x5ABF0000
+ -baseaddress:0x5AB90000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/sun/text/*
@OPENJDK7@/build/linux-amd64/j2re-image/lib/ext/localedata.jar
@OPENJDK7@/jdk/src/share/classes/java/text/*.class
@@ -789,7 +789,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Security.dll
- -baseaddress:0x5AE60000
+ -baseaddress:0x5AE00000
-remap:security.xml
sun/security/jgss/wrapper/*.class
@OPENJDK7@/jdk/src/share/classes/com/sun/crypto/provider/*.class
@@ -860,7 +860,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Management.dll
- -baseaddress:0x5B670000
+ -baseaddress:0x5B610000
com/sun/management/*.class
java/lang/management/*.class
sun/management/*.class
@@ -894,7 +894,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Misc.dll
- -baseaddress:0x5B9D0000
+ -baseaddress:0x5B970000
-resource:com/sun/servicetag/resources/javase_5_swordfish.properties=@OPENJDK7@/jdk/src/share/classes/com/sun/servicetag/resources/javase_5_swordfish.properties
-resource:com/sun/servicetag/resources/javase_6_swordfish.properties=@OPENJDK7@/jdk/src/share/classes/com/sun/servicetag/resources/javase_6_swordfish.properties
-resource:com/sun/servicetag/resources/javase_7_swordfish.properties=@OPENJDK7@/jdk/src/share/classes/com/sun/servicetag/resources/javase_7_swordfish.properties
@@ -995,7 +995,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Naming.dll
- -baseaddress:0x5BAC0000
+ -baseaddress:0x5BA60000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/jndi/ldap/jndiprovider.properties
-resource:META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor=@OPENJDK7@/jdk/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services/sun.net.spi.nameservice.NameServiceDescriptor
sun/net/dns/*.class
@@ -1021,7 +1021,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Jdbc.dll
- -baseaddress:0x5BC10000
+ -baseaddress:0x5BBB0000
-resource:META-INF/services/java.sql.Driver=resources/META-INF/services/java.sql.Driver
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/rowset/*
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/javax/sql/*
@@ -1039,7 +1039,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Remoting.dll
- -baseaddress:0x5BD60000
+ -baseaddress:0x5BD00000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/sun/rmi/*
@OPENJDK7@/build/linux-amd64/classes/sun/rmi/registry/*.class
@OPENJDK7@/build/linux-amd64/classes/sun/rmi/server/*.class
@@ -1065,7 +1065,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Beans.dll
- -baseaddress:0x5BE80000
+ -baseaddress:0x5BE20000
@OPENJDK7@/build/linux-amd64/impsrc/com/sun/activation/registries/*.class
@OPENJDK7@/build/linux-amd64/impsrc/javax/activation/*.class
@OPENJDK7@/jdk/src/share/classes/com/sun/beans/*.class
@@ -1078,7 +1078,7 @@ assembly.class
}
{
-out:IKVM.OpenJDK.Media.dll
- -baseaddress:0x5BF40000
+ -baseaddress:0x5BEE0000
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/META-INF/services/javax.print.*
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/META-INF/services/javax.sound.*
-recurse:@OPENJDK7@/build/linux-amd64/j2re-image/lib/resources.jar/com/sun/imageio/plugins/common/iio-plugin.properties
diff --git a/openjdk/sun/nio/ch/DatagramChannelImpl.java b/openjdk/sun/nio/ch/DatagramChannelImpl.java
index a987bbc4..b2631530 100644
--- a/openjdk/sun/nio/ch/DatagramChannelImpl.java
+++ b/openjdk/sun/nio/ch/DatagramChannelImpl.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -657,7 +657,12 @@ class DatagramChannelImpl
throw new AlreadyBoundException();
InetSocketAddress isa;
if (local == null) {
- isa = new InetSocketAddress(0);
+ // only Inet4Address allowed with IPv4 socket
+ if (family == StandardProtocolFamily.INET) {
+ isa = new InetSocketAddress(InetAddress.getByName("0.0.0.0"), 0);
+ } else {
+ isa = new InetSocketAddress(0);
+ }
} else {
isa = Net.checkAddress(local);
@@ -966,7 +971,8 @@ class DatagramChannelImpl
protected void implCloseSelectableChannel() throws IOException {
synchronized (stateLock) {
- nd.preClose(fd);
+ if (state != ST_KILLED)
+ nd.preClose(fd);
ResourceManager.afterUdpClose();
// if member of mulitcast group then invalidate all keys