You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/03/13 17:49:38 UTC
svn commit: r922603 - in /harmony/enhanced/classlib/branches/java6: ./
depends/libs/ depends/oss/ make/ modules/archive/src/main/java/java/util/zip/
modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/
modules/auth/src/main/java/commo...
Author: hindessm
Date: Sat Mar 13 16:49:37 2010
New Revision: 922603
URL: http://svn.apache.org/viewvc?rev=922603&view=rev
Log:
Merge updates from classlib trunk@922278
Added:
harmony/enhanced/classlib/branches/java6/modules/luni/make/depends.properties
- copied unchanged from r922278, harmony/enhanced/classlib/trunk/modules/luni/make/depends.properties
Removed:
harmony/enhanced/classlib/branches/java6/depends/oss/fdlibm_5.2.zip
Modified:
harmony/enhanced/classlib/branches/java6/ (props changed)
harmony/enhanced/classlib/branches/java6/LICENSE
harmony/enhanced/classlib/branches/java6/depends/libs/ (props changed)
harmony/enhanced/classlib/branches/java6/depends/oss/ (props changed)
harmony/enhanced/classlib/branches/java6/depends/oss/README.txt
harmony/enhanced/classlib/branches/java6/make/depends-common.xml (props changed)
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipEntry.java
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipFile.java
harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java
harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java
harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h (props changed)
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/math.c
harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/exports.txt
harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/DatagramChannelImpl.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/unix/org/apache/harmony/nio/internal/EpollSelectorImpl.java
harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/ (props changed)
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java (props changed)
harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/ (props changed)
Propchange: harmony/enhanced/classlib/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/classlib/trunk:713674-735919,765923-920556
+/harmony/enhanced/classlib/trunk:713674-735919,765923-922278
/harmony/enhanced/classlib/trunk/working_classlib:884014-884286
/harmony/enhanced/trunk/working_classlib:476396-920147
/incubator/harmony/enhanced/trunk/working_classlib:423974-476394
Modified: harmony/enhanced/classlib/branches/java6/LICENSE
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/LICENSE?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/LICENSE (original)
+++ harmony/enhanced/classlib/branches/java6/LICENSE Sat Mar 13 16:49:37 2010
@@ -263,7 +263,7 @@ their respective owners.
-License Notice for FDLIBM version 5.2
+License Notice for FDLIBM version 5.3
=====================================
Copyright (C) 2004 by Sun Microsystems, Inc. All rights reserved.
Propchange: harmony/enhanced/classlib/branches/java6/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/depends/libs:544451-920556
+/harmony/enhanced/classlib/trunk/depends/libs:544451-922278
Propchange: harmony/enhanced/classlib/branches/java6/depends/oss/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Mar 13 16:49:37 2010
@@ -1 +1,2 @@
findbugs-1.3.9
+fdlibm-5.3
Modified: harmony/enhanced/classlib/branches/java6/depends/oss/README.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/depends/oss/README.txt?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/depends/oss/README.txt (original)
+++ harmony/enhanced/classlib/branches/java6/depends/oss/README.txt Sat Mar 13 16:49:37 2010
@@ -17,13 +17,11 @@ document please refer to the file THIRD_
-FDLIBM version 5.2
+FDLIBM version 5.3
------------------
FDLIBM (Freely Distributable LIBM) is a C math library for supporting IEEE 754
-floating-point arithmetic. File fdlibm_5.2.zip mostly contains the original
-source as downloaded from the FDLIBM home page with the
-exception of a few files whose names clashed with others in Harmony. In the
-zip file these files have all been given the ".orig" suffix.
+floating-point arithmetic. File fdlibm53.tar.gz contains the original source
+as downloaded from the FDLIBM home page.
The official FDLIBM page is located at http://www.netlib.org/fdlibm/
Propchange: harmony/enhanced/classlib/branches/java6/make/depends-common.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-920556
+/harmony/enhanced/classlib/trunk/make/depends-common.xml:768152-922278
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipEntry.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipEntry.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipEntry.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipEntry.java Sat Mar 13 16:49:37 2010
@@ -25,6 +25,7 @@ import java.io.UnsupportedEncodingExcept
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
+import org.apache.harmony.archive.internal.nls.Messages;
/**
* An instance of {@code ZipEntry} represents an entry within a <i>ZIP-archive</i>.
@@ -363,7 +364,7 @@ public class ZipEntry implements ZipCons
long sig = (hdrBuf[0] & 0xff) | ((hdrBuf[1] & 0xff) << 8) |
((hdrBuf[2] & 0xff) << 16) | ((hdrBuf[3] << 24) & 0xffffffffL);
if (sig != CENSIG) {
- throw new ZipException("Central Directory Entry not found");
+ throw new ZipException(Messages.getString("archive.3A"));
}
compressionMethod = (hdrBuf[10] & 0xff) | ((hdrBuf[11] & 0xff) << 8);
@@ -443,7 +444,7 @@ public class ZipEntry implements ZipCons
int b3 = raf.read();
if (b3 < 0) {
- throw new EOFException("in ZipEntry.readIntLE(RandomAccessFile)");
+ throw new EOFException(Messages.getString("archive.3B"));
}
return b0 | (b1 << 8) | (b2 << 16) | (b3 << 24); // ATTENTION: DOES SIGN EXTENSION: IS THIS WANTED?
}
@@ -459,7 +460,7 @@ public class ZipEntry implements ZipCons
if (in.read(b, 0, 2) == 2) {
return (b[0] & 0XFF) | ((b[1] & 0XFF) << 8);
} else {
- throw new EOFException("in ZipEntry.readShortLE(InputStream)");
+ throw new EOFException(Messages.getString("archive.3C"));
}
}
@@ -474,7 +475,7 @@ public class ZipEntry implements ZipCons
| ((b[3] & 0XFF) << 24))
& 0XFFFFFFFFL; // Here for sure NO sign extension is wanted.
} else {
- throw new EOFException("in ZipEntry.readIntLE(InputStream)");
+ throw new EOFException(Messages.getString("archive.3D"));
}
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipFile.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipFile.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipFile.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/java/util/zip/ZipFile.java Sat Mar 13 16:49:37 2010
@@ -27,6 +27,7 @@ import java.security.PrivilegedAction;
import java.util.Enumeration;
import java.util.LinkedHashMap;
import java.util.Iterator;
+import org.apache.harmony.archive.internal.nls.Messages;
/**
* This class provides random read access to a <i>ZIP-archive</i> file.
@@ -161,7 +162,7 @@ public class ZipFile implements ZipConst
private void checkNotClosed() {
if (mRaf == null) {
- throw new IllegalStateException("Zip File closed.");
+ throw new IllegalStateException(Messages.getString("archive.36"));
}
}
@@ -299,7 +300,7 @@ public class ZipFile implements ZipConst
*/
long scanOffset = mRaf.length() - ENDHDR;
if (scanOffset < 0) {
- throw new ZipException("too short to be Zip");
+ throw new ZipException(Messages.getString("archive.37"));
}
long stopOffset = scanOffset - 65536;
@@ -315,7 +316,7 @@ public class ZipFile implements ZipConst
scanOffset--;
if (scanOffset < stopOffset) {
- throw new ZipException("EOCD not found; not a Zip archive?");
+ throw new ZipException(Messages.getString("archive.38"));
}
}
@@ -341,7 +342,7 @@ public class ZipFile implements ZipConst
if (numEntries != totalNumEntries ||
diskNumber != 0 ||
diskWithCentralDir != 0) {
- throw new ZipException("spanned archives not supported");
+ throw new ZipException(Messages.getString("archive.39"));
}
/*
Modified: harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/archive/src/main/java/org/apache/harmony/archive/internal/nls/messages.properties Sat Mar 13 16:49:37 2010
@@ -69,3 +69,11 @@ archive.32={0} has invalid digest for {1
archive.33=A length of the encoded header name "{1}" exceeded maximum length {2}
archive.34=A jar verifier does not support more than one entry with the same name
archive.35=JarFile has been closed
+archive.36=Zip File closed.
+archive.37=too short to be Zip
+archive.38=EOCD not found; not a Zip archive?
+archive.39=spanned archives not supported
+archive.3A=Central Directory Entry not found
+archive.3B=in ZipEntry.readIntLE(RandomAccessFile)
+archive.3C=in ZipEntry.readShortLE(InputStream)
+archive.3D=in ZipEntry.readIntLE(InputStream)
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KDCRequest.java Sat Mar 13 16:49:37 2010
@@ -33,6 +33,7 @@ import org.apache.harmony.security.asn1.
import org.apache.harmony.security.asn1.ASN1SequenceOf;
import org.apache.harmony.security.asn1.ASN1StringType;
import org.apache.harmony.security.asn1.ASN1Type;
+import org.apache.harmony.auth.internal.nls.Messages;
/**
* @see http://www.ietf.org/rfc/rfc3961.txt
@@ -70,7 +71,7 @@ public class KDCRequest {
public DatagramSocket send(InetAddress address, int port) throws IOException {
if (msgType != AS_REQ) {
- throw new RuntimeException("Not implemented");
+ throw new RuntimeException(Messages.getString("auth.65"));
}
byte[] enc = AS_REQ_ASN1.encode(this);
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/kerberos/v5/KerberosErrorMessage.java Sat Mar 13 16:49:37 2010
@@ -30,6 +30,7 @@ import org.apache.harmony.security.asn1.
import org.apache.harmony.security.asn1.ASN1Type;
import org.apache.harmony.security.asn1.BerInputStream;
import org.apache.harmony.security.asn1.DerInputStream;
+import org.apache.harmony.auth.internal.nls.Messages;
/**
* Kerberos Error Message type.
@@ -162,7 +163,7 @@ public class KerberosErrorMessage {
@Override
protected void getValues(Object object, Object[] values) {
- throw new RuntimeException("KerberosErrorMessage encoder is not implemented");
+ throw new RuntimeException(Messages.getString("auth.64"));
}
};
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/internal/nls/messages.properties Sat Mar 13 16:49:37 2010
@@ -99,3 +99,21 @@ auth.50=\n\tInvalid options format {0}
auth.51=\n\tInvalid token: {0}
auth.52=Error code: {0}
auth.53=Unable to locate a login configuration
+auth.54=Fail to login
+auth.55=Subject is readonly.
+auth.56=Unable to locate JNDI user provider
+auth.57=Unable to locate JNDI group provider
+auth.58=Cannot get user password
+auth.59=Cannot get uidNumber information
+auth.5A=Cannot get gidNumber information
+auth.5B=no CallbackHandler available
+auth.5C=Login incorrect
+auth.5D=No shared status
+auth.5E=Cannot get user ID or user password from shared state
+auth.5F=No Shared State
+auth.60=Login Module is not initialized.
+auth.61=PKCS11 must have NONE as keyStoreURL and privateKeyPasswordURL unset
+auth.62=Protected authentication path must have keyStorePasswordURL and privateKeyPasswordURL unset
+auth.63=Failure to get KeyStore or KeyStore Password
+auth.64=KerberosErrorMessage encoder is not implemented
+auth.65=Not implemented
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/JndiLoginModule.java Sat Mar 13 16:49:37 2010
@@ -45,6 +45,7 @@ import javax.security.auth.spi.LoginModu
import org.apache.harmony.auth.UnixNumericGroupPrincipal;
import org.apache.harmony.auth.UnixNumericUserPrincipal;
import org.apache.harmony.auth.UnixPrincipal;
+import org.apache.harmony.auth.internal.nls.Messages;
public class JndiLoginModule extends SharedStateManager implements LoginModule {
@@ -107,11 +108,11 @@ public class JndiLoginModule extends Sha
return true;
case logout:
clear();
- throw new LoginException("Fail to login");
+ throw new LoginException(Messages.getString("auth.54"));
default:
if (subject.isReadOnly()) {
clear();
- throw new LoginException("Subject is readonly.");
+ throw new LoginException(Messages.getString("auth.55"));
}
subject.getPrincipals().add(unixPrincipal);
debugUtil.recordDebugInfo("[JndiLoginModule] added UnixPrincipal to Subject\n");
@@ -173,10 +174,10 @@ public class JndiLoginModule extends Sha
jndiUserProvider = (String) options.get("user.provider.url");
jndiGroupProvider = (String) options.get("group.provider.url");
if (jndiUserProvider == null) {
- throw new LoginException("Unable to locate JNDI user provider");
+ throw new LoginException(Messages.getString("auth.56"));
}
if (jndiGroupProvider == null) {
- throw new LoginException("Unable to locate JNDI group provider");
+ throw new LoginException(Messages.getString("auth.57"));
}
debugUtil.recordDebugInfo("[JndiLoginModule] user provider: " + jndiUserProvider + "\n"
+"[JndiLoginModule] group provider: " + jndiGroupProvider
@@ -218,7 +219,7 @@ public class JndiLoginModule extends Sha
attrIds);
passwordAttr = userAttrs.get("userPassword");
if (passwordAttr == null) {
- throw new LoginException("Cannot get user password");
+ throw new LoginException(Messages.getString("auth.58"));
}
jndiUserPassword = new String((byte[])passwordAttr.get());
if (!jndiUserPassword.equals(crypto(new String(userPassword)))) {
@@ -227,13 +228,13 @@ public class JndiLoginModule extends Sha
uidNumberAttr = userAttrs.get("uidNumber");
if (uidNumberAttr == null) {
- throw new LoginException("Cannot get uidNumber information");
+ throw new LoginException(Messages.getString("auth.59"));
}
uidNumber = Long.valueOf((String) uidNumberAttr.get());
gidNumberAttr = userAttrs.get("gidNumber");
if (gidNumberAttr == null) {
- throw new LoginException("Cannot get gidNumber information");
+ throw new LoginException(Messages.getString("auth.5A"));
}
gidNumber = Long.valueOf((String) gidNumberAttr.get());
}
@@ -255,7 +256,7 @@ public class JndiLoginModule extends Sha
protected void getUserIdentityFromCallbackHandler() throws LoginException {
if (callbackHandler == null) {
- throw new LoginException("no CallbackHandler available");
+ throw new LoginException(Messages.getString("auth.5B"));
}
ArrayList<Callback> callbacks = new ArrayList<Callback>();
NameCallback jndiNameCallback = new NameCallback("User ID");
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/KeyStoreLoginModule.java Sat Mar 13 16:49:37 2010
@@ -44,6 +44,7 @@ import javax.security.auth.login.LoginEx
import javax.security.auth.spi.LoginModule;
import javax.security.auth.x500.X500Principal;
import javax.security.auth.x500.X500PrivateCredential;
+import org.apache.harmony.auth.internal.nls.Messages;
public class KeyStoreLoginModule implements LoginModule {
@@ -101,11 +102,11 @@ public class KeyStoreLoginModule impleme
return true;
case logout:
clear();
- throw new LoginException("Fail to login");
+ throw new LoginException(Messages.getString("auth.54"));
default:
if (subject.isReadOnly()) {
clear();
- throw new LoginException("Subject is readonly.");
+ throw new LoginException(Messages.getString("auth.55"));
}
subject.getPrincipals().add(principal);
subject.getPublicCredentials().add(certPath);
@@ -174,7 +175,7 @@ public class KeyStoreLoginModule impleme
if (!keyStoreURL.equals("NONE")
|| privateKeyPasswordURL != null) {
throw new LoginException(
- "PKCS11 must have NONE as keyStoreURL and privateKeyPasswordURL unset");
+ Messages.getString("auth.61"));
}
needPrivateKeyPassword = false;
}
@@ -182,7 +183,7 @@ public class KeyStoreLoginModule impleme
if (has_protected_authentication_path) {
if (keyStorePasswordURL != null && privateKeyPasswordURL != null) {
throw new LoginException(
- "Protected authentication path must have keyStorePasswordURL and privateKeyPasswordURL unset");
+ Messages.getString("auth.62"));
}
needKeyStorePassword = false;
needPrivateKeyPassword = false;
@@ -274,7 +275,7 @@ public class KeyStoreLoginModule impleme
if (null == keyStoreURL || (needKeyStorePassword && null == keyStorePassword)) {
throw new LoginException(
- "Failure to get KeyStore or KeyStore Password");
+ Messages.getString("auth.63"));
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/LoginModuleUtils.java Sat Mar 13 16:49:37 2010
@@ -23,6 +23,7 @@ import java.io.InputStream;
import java.util.Arrays;
import javax.security.auth.login.LoginException;
+import org.apache.harmony.auth.internal.nls.Messages;
public class LoginModuleUtils {
@@ -80,7 +81,7 @@ public class LoginModuleUtils {
public ACTION checkLogin() throws LoginException {
switch (phase) {
case uninitialized:
- throw new LoginException("Login Module is not initialized.");
+ throw new LoginException(Messages.getString("auth.60"));
case initialized:
return ACTION.login;
default:
@@ -91,7 +92,7 @@ public class LoginModuleUtils {
public ACTION checkCommit() throws LoginException {
switch (phase) {
case uninitialized:
- throw new LoginException("Login Module is not initialized.");
+ throw new LoginException(Messages.getString("auth.60"));
case initialized:
return ACTION.logout;
case logined:
@@ -104,7 +105,7 @@ public class LoginModuleUtils {
public ACTION checkLogout() throws LoginException {
switch (phase) {
case uninitialized:
- throw new LoginException("Login Module is not initialized.");
+ throw new LoginException(Messages.getString("auth.60"));
case initialized:
case logined:
return ACTION.no_action;
Modified: harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/auth/src/main/java/common/org/apache/harmony/auth/module/SharedStateManager.java Sat Mar 13 16:49:37 2010
@@ -21,6 +21,7 @@ import java.util.Map;
import javax.security.auth.login.FailedLoginException;
import javax.security.auth.login.LoginException;
+import org.apache.harmony.auth.internal.nls.Messages;
abstract public class SharedStateManager {
@@ -91,7 +92,7 @@ abstract public class SharedStateManager
debugUtil.recordDebugInfo("[" + getModuleName()
+ "] regular authentication failed\n");
debugUtil.printAndClearDebugInfo();
- throw new FailedLoginException("Login incorrect");
+ throw new FailedLoginException(Messages.getString("auth.5C"));
} else {
debugUtil.recordDebugInfo("[" + getModuleName()
+ "] regular authentication succeeded\n");
@@ -108,7 +109,7 @@ abstract public class SharedStateManager
+ "] regular authentication failed\n");
}
debugUtil.printAndClearDebugInfo();
- throw new FailedLoginException("Login incorrect");
+ throw new FailedLoginException(Messages.getString("auth.5C"));
}
} else {
if (tryFirstPass) {
@@ -128,14 +129,14 @@ abstract public class SharedStateManager
private void getUserIdentityFromSharedStatus() throws LoginException {
if (sharedState == null)
- throw new LoginException("No shared status");
+ throw new LoginException(Messages.getString("auth.5D"));
String userName = (String) sharedState
.get("javax.security.auth.login.name");
char[] userPassword = (char[]) sharedState
.get("javax.security.auth.login.password");
if (userName == null || userPassword == null) {
throw new LoginException(
- "Cannot get user ID or user password from shared state");
+ Messages.getString("auth.5E"));
}
setUserName(userName);
setUserPassword(userPassword);
@@ -144,7 +145,7 @@ abstract public class SharedStateManager
protected void storePass() throws LoginException {
if (storePass) {
if (sharedState == null) {
- throw new LoginException("No Shared State");
+ throw new LoginException(Messages.getString("auth.5F"));
}
if (sharedState.get("javax.security.auth.login.name") == null) {
sharedState
@@ -160,7 +161,7 @@ abstract public class SharedStateManager
protected void clearPass() throws LoginException {
if (clearPass) {
if (sharedState == null) {
- throw new LoginException("No Shared State");
+ throw new LoginException(Messages.getString("auth.5F"));
}
sharedState.remove("javax.security.auth.login.name");
sharedState.remove("javax.security.auth.login.password");
Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/atomic/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-920556
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/atomic:765923-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/concurrent/src/main/java/java/util/concurrent/locks/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-920556
+/harmony/enhanced/classlib/trunk/modules/concurrent/src/main/java/java/util/concurrent/locks:765923-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/jmx/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-920556
+/harmony/enhanced/classlib/trunk/modules/jmx/META-INF:768152-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-920556
+/harmony/enhanced/classlib/trunk/modules/lang-management/src/test/api/java/org/apache/harmony/lang/management/tests/java/util/logging:768152-922278
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/build.xml?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/build.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/build.xml Sat Mar 13 16:49:37 2010
@@ -21,16 +21,23 @@
<property name="hy.module" value="luni" />
<property name="hy.hdk" location="${basedir}/../../deploy" />
+ <property name="depends.dir" location="${basedir}/../../depends" />
<import file="${hy.hdk}/build/ant/properties.xml" />
+ <import file="${hy.hdk}/build/ant/depends.xml" />
<property file="../../make/depends.properties" />
- <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
+ <property name="fdlibm.dist" location="src/main/native/fdlibm_dist"/>
<target name="build" depends="compile-java, build-jar" />
<target name="clean" depends="clean-java,clean-native,clean-test" />
+ <target name="check-depends">
+ <check-one-file src="${fdlibm.url}" dest="${fdlibm.tar}" />
+ </target>
+
+
<target name="copy-native-includes">
<copy todir="${hy.hdk}/include" preservelastmodified="true">
<fileset dir="src/main/native/include">
@@ -112,7 +119,24 @@
<target name="overlay-oss" depends="-unzip-oss,-ascii2ebcdic-conversion" />
<target name="-unzip-oss">
- <unzip src="${fdlibm.zip}" dest="src/main/native/fdlibm_dist" />
+ <untar src="${fdlibm.tar}" compression="gzip" dest="${fdlibm.dist}">
+ <patternset>
+ <exclude name="fdlibm53"/>
+ </patternset>
+ <mapper type="flatten"/>
+ </untar>
+
+ <!-- These files are not used by Harmony, rename them in case misused -->
+ <move todir="${fdlibm.dist}">
+ <fileset dir="${fdlibm.dist}" >
+ <include name="fdlibm.h"/>
+ <include name="s_lib_version.c"/>
+ <include name="configure*"/>
+ <include name="Makefile*"/>
+ </fileset>
+ <mapper type="glob" from="*" to="*.orig" />
+ </move>
+
<chmod dir="src/main/native/fdlibm_dist" perm="ugo+r" />
</target>
@@ -133,6 +157,12 @@
<delete dir="src/main/native/fdlibm_dist_ascii" />
</target>
+ <target name="fetch-depends" >
+ <mkdir dir="${fdlibm.dir}" />
+ <download-one-file src="${fdlibm.url}" dest="${fdlibm.tar}"
+ md5="${fdlibm.md5}" />
+ </target>
+
<target name="test" depends="-test-module">
<fail message="Some tests failed">
<condition>
@@ -282,10 +312,9 @@
</tokenfilter>
</filterchain>
</copy>
-
- <copy file="../../${junit.jar}"
+ <copy file="${junit.jar}"
tofile="${hy.hdk}/build/test/junit.jar" />
- <copy file="../../${jetty.jar}" todir="${hy.hdk}/build/test" />
+ <copy file="${jetty.jar}" todir="${hy.hdk}/build/test" />
</target>
<!-- compile both api tests and impl tests-->
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/lang/Math.java Sat Mar 13 16:49:37 2010
@@ -732,23 +732,7 @@ public final class Math {
* the exponent of the operation.
* @return {@code x} to the power of {@code y}.
*/
- public static double pow(double x, double y) {
- if (x < 0.0 && x != Double.NEGATIVE_INFINITY) {
- if (y != Double.NEGATIVE_INFINITY && y != Double.POSITIVE_INFINITY) { // is finit
- if (y == Math.ceil(y)) { // is integer
- double absx = Math.abs(x);
- if (y % 2 == 0.0) {
- return doPow(absx, y);
- }
- return -1.0 * doPow(absx, y);
- }
- return Double.NaN;
- }
- }
- return doPow(x, y);
- }
-
- private static native double doPow(double x, double y);
+ public static native double pow(double x, double y);
/**
* Returns the double conversion of the result of rounding the argument to
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/java/net/InetAddress.java Sat Mar 13 16:49:37 2010
@@ -1255,10 +1255,11 @@ public class InetAddress extends Object
}
// the rest should be the scope string
- scopeString = tokenizer.nextToken();
+ StringBuilder buf = new StringBuilder();
while (tokenizer.hasMoreTokens()) {
- scopeString = scopeString + tokenizer.nextToken();
+ buf.append(tokenizer.nextToken());
}
+ scopeString = buf.toString();
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/Header.java Sat Mar 13 16:49:37 2010
@@ -92,7 +92,7 @@ public class Header implements Cloneable
}
return clone;
} catch (CloneNotSupportedException e) {
- return null;
+ throw new AssertionError(e);
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/jar/JarURLConnectionImpl.java Sat Mar 13 16:49:37 2010
@@ -150,12 +150,12 @@ public class JarURLConnectionImpl extend
jar = AccessController
.doPrivileged(new PrivilegedAction<JarFile>() {
public JarFile run() {
+ FileOutputStream fos = null;
try {
File tempJar = File.createTempFile(
"hyjar_", ".tmp", null);
tempJar.deleteOnExit();
- FileOutputStream fos = new FileOutputStream(
- tempJar);
+ fos = new FileOutputStream(tempJar);
byte[] buf = new byte[4096];
int nbytes = 0;
while ((nbytes = is.read(buf)) > -1) {
@@ -167,6 +167,12 @@ public class JarURLConnectionImpl extend
| ZipFile.OPEN_DELETE);
} catch (IOException e) {
return null;
+ } finally {
+ if (fos != null) {
+ try {
+ fos.close();
+ } catch (IOException e) {}
+ }
}
}
});
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-922278
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/math.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/math.c?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/math.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/shared/math.c Sat Mar 13 16:49:37 2010
@@ -542,7 +542,7 @@ Java_java_lang_StrictMath_pow (JNIEnv *
}
JNIEXPORT jdouble JNICALL
-Java_java_lang_Math_doPow (JNIEnv * env, jclass jclazz, jdouble arg1,
+Java_java_lang_Math_pow (JNIEnv * env, jclass jclazz, jdouble arg1,
jdouble arg2)
{
return internal_pow (arg1, arg2);
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/exports.txt
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/exports.txt?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/exports.txt (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/luni/unix/exports.txt Sat Mar 13 16:49:37 2010
@@ -82,7 +82,7 @@ Java_java_lang_Math_log10
Java_java_lang_Math_log1p
Java_java_lang_Math_nextafter
Java_java_lang_Math_nextafterf
-Java_java_lang_Math_doPow
+Java_java_lang_Math_pow
Java_java_lang_Math_rint
Java_java_lang_Math_sin
Java_java_lang_Math_sinh
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-920556
+/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-922278
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/DatagramChannelImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/DatagramChannelImpl.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/DatagramChannelImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/DatagramChannelImpl.java Sat Mar 13 16:49:37 2010
@@ -386,9 +386,14 @@ class DatagramChannelImpl extends Datagr
synchronized (writeLock) {
long data_address = AddressUtil
.getDirectBufferAddress(source);
- sendCount = networkSystem.sendDatagramDirect(fd,
- data_address, start, length, isa.getPort(), false,
- trafficClass, isa.getAddress());
+ if (isConnected()) {
+ sendCount = networkSystem.sendConnectedDatagramDirect(
+ fd, data_address, start, length, false);
+ } else {
+ sendCount = networkSystem.sendDatagramDirect(fd,
+ data_address, start, length, isa.getPort(),
+ false, trafficClass, isa.getAddress());
+ }
}
} else {
if (source.hasArray()) {
@@ -400,9 +405,14 @@ class DatagramChannelImpl extends Datagr
start = 0;
}
synchronized (writeLock) {
- sendCount = networkSystem.sendDatagram(fd, array, start,
- length, isa.getPort(), false, trafficClass, isa
- .getAddress());
+ if (isConnected()) {
+ sendCount = networkSystem.sendConnectedDatagram(fd,
+ array, start, length, false);
+ } else {
+ sendCount = networkSystem.sendDatagram(fd, array,
+ start, length, isa.getPort(), false,
+ trafficClass, isa.getAddress());
+ }
}
}
source.position(oldposition + sendCount);
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/MappedByteBufferFactory.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/MappedByteBufferFactory.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/MappedByteBufferFactory.java Sat Mar 13 16:49:37 2010
@@ -50,13 +50,13 @@ class MappedByteBufferFactory {
}
static MappedByteBuffer getBuffer(PlatformAddress addr, int mapmode,
- long size, int offset) throws Exception {
+ long size, int offset) throws Exception {
/*
* Spec points out explicitly that the size of map should be no greater
* than Integer.MAX_VALUE, so long to int cast is safe here.
*/
return (MappedByteBuffer) constructor.newInstance(new Object[] { addr,
- new Integer((int) size), new Integer(offset),
- new Integer(mapmode) });
+ Integer.valueOf((int)size), Integer.valueOf(offset),
+ Integer.valueOf(mapmode) });
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java Sat Mar 13 16:49:37 2010
@@ -119,7 +119,6 @@ public class ServerSocketChannelImpl ext
begin();
synchronized (acceptLock) {
- synchronized (blockingLock()) {
boolean isBlocking = isBlocking();
if (!isBlocking) {
// for non blocking mode, use select to see whether
@@ -145,7 +144,6 @@ public class ServerSocketChannelImpl ext
// mode.
}
} while (isBlocking);
- }
}
} finally {
end(socketGot.isConnected());
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/unix/org/apache/harmony/nio/internal/EpollSelectorImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/unix/org/apache/harmony/nio/internal/EpollSelectorImpl.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/unix/org/apache/harmony/nio/internal/EpollSelectorImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/unix/org/apache/harmony/nio/internal/EpollSelectorImpl.java Sat Mar 13 16:49:37 2010
@@ -35,10 +35,8 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
-import java.lang.Class;
import org.apache.harmony.luni.platform.FileDescriptorHandler;
-import org.apache.harmony.luni.platform.Platform;
/*
* Default implementation of java.nio.channels.Selector
@@ -504,7 +502,7 @@ final class EpollSelectorImpl extends Ab
Entry deleted = new Entry(-1, null);
- final int threshRatio = 4;
+ static final int threshRatio = 4;
public InternalKeyMap() {
this(1);
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java Sat Mar 13 16:49:37 2010
@@ -586,5 +586,33 @@ public class ServerSocketChannelTest ext
serverChannel.close();
}
-
+ /**
+ * Regression test for HARMONY-6375
+ */
+ public void test_accept_configureBlocking() throws Exception {
+ InetSocketAddress localAddr = new InetSocketAddress("localhost", 0);
+ serverChannel.socket().bind(localAddr);
+
+ // configure the channel non-blocking
+ // when it is accepting in main thread
+ new Thread() {
+ public void run() {
+ try {
+ Thread.sleep(TIME_UNIT);
+ serverChannel.configureBlocking(false);
+ serverChannel.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }.start();
+
+ try {
+ serverChannel.accept();
+ fail("should throw AsynchronousCloseException");
+ } catch (AsynchronousCloseException e) {
+ // expected
+ }
+ serverChannel.close();
+ }
}
Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-920556
+/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-920556
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-920556
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-922278
Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c?rev=922603&r1=922602&r2=922603&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/thread/shared/hythread.c Sat Mar 13 16:49:37 2010
@@ -1432,7 +1432,7 @@ hythread_cancel (hythread_t thread)
return;
}
- THREAD_CANCEL (thread->handle);
+ (void)THREAD_CANCEL (thread->handle);
thread->flags |= HYTHREAD_FLAG_CANCELED;
Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-920556
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-920556
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-922278
Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Mar 13 16:49:37 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-920556
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-922278