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/02/14 09:40:48 UTC
svn commit: r909986 [6/6] - in /harmony/enhanced/classlib/branches/java6: ./
depends/jars/ depends/libs/ make/
modules/auth/src/main/java/common/org/apache/harmony/auth/
modules/auth/src/main/java/windows/org/apache/harmony/auth/
modules/awt/src/main/j...
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/nls/messages.properties Sun Feb 14 08:40:42 2010
@@ -26,3 +26,215 @@
luni.09=Invalid Unicode sequence: illegal character
luni.0A=Index: {0}, Size: {1}
luni.0B=Array index out of range: {0}
+luni.0C=Socket is closed
+luni.0D=SOCKS connection failed\: {0}
+luni.0E=Unable to connect to SOCKS server\: {0}
+luni.0F=Invalid SOCKS client.
+luni.10=Malformed reply from SOCKS server
+luni.11=buffer is null
+luni.12=Offset out of bounds \: {0}
+luni.13=Arguments out of bounds
+luni.14=Failure to connect to SOCKS server.
+luni.15=Unable to connect to identd to verify user.
+luni.16=Failure - user ids do not match.
+luni.17=Success
+luni.18=Length out of bounds \: {0}
+luni.19=the methods named {0} must have the same return type
+luni.1A=Host is unresolved\: {0}
+luni.1B=url and proxy can not be null
+luni.1C=Unable to change directories
+luni.1D=Unable to connect to server\: {0}
+luni.1E=Could not establish data connection
+luni.1F=Unable to retrieve file\: {0}
+luni.20=Unable to log into server\: {0}
+luni.21=Unable to configure data port
+luni.22=Unable to store file
+luni.23=Unable to set transfer type
+luni.24=Stream is closed
+luni.25=Content-Length underflow
+luni.26=Content-Length exceeded
+luni.27=Cannot access request header fields after connection is set
+luni.28=This protocol does not support input
+luni.29=Does not support output
+luni.2A=can't open OutputStream after reading from an inputStream
+luni.2B=This method does not support writing\: {0}
+luni.2C=Cannot set method after connection is made
+luni.2D=Received HTTP_PROXY_AUTH (407) code while not using proxy
+luni.2E=Received authentication challenge is null
+luni.2F=Too many redirects
+luni.30=Invalid proxy port\: {0}
+luni.31=Proxy port out of range
+luni.32=Cannot find \!/
+luni.33=Inputstream of the JarURLConnection has been closed
+luni.34=Jar entry not specified
+luni.35=Start index ({0}) is greater than end index ({1})
+luni.36=Array index out of range\: {0}
+luni.37=Negative index specified
+luni.38=Source size {0} does not fit into destination
+luni.39=Format specifier '{0}'
+luni.3A=Can't find resource for bundle {0}, key {1}
+luni.3B=DST offset\: {0}
+luni.3C=era\: {0}
+luni.3D=month\: {0}
+luni.3E=time\: {0}
+luni.3F=day of month\: {0}
+luni.40=day of week in month\: {0}
+luni.41=Timer was cancelled
+luni.42=Illegal delay to start the TimerTask
+luni.43=TimerTask is scheduled already
+luni.44=TimerTask is cancelled
+luni.45=Conversion is '{0}'
+luni.46=The flags are {0}
+luni.47=Invalid UUID string
+luni.48=day of week\: {0}
+luni.49=SocketAddress {0} not supported
+luni.4A=Count out of range
+luni.4B={0} incompatible with {1}
+luni.4C=Enums may not be cloned
+luni.4D=Argument must not be null
+luni.4E={0} is not an enum type
+luni.4F={0} is not a constant in the enum type {1}
+luni.50={0} is not an interface
+luni.51={0} is not visible from class loader
+luni.52={0} appears more than once
+luni.53=non-public interfaces must be in the same package
+luni.54=not a proxy instance
+luni.55=String index out of range\: {0}
+luni.56=Port out of range\: {0}
+luni.57=Unresolved address
+luni.58=Packet address mismatch with connected address
+luni.59=Destination address is null
+luni.5A=Zero or negative buffer size
+luni.5B=Invalid negative timeout
+luni.5C=The factory has already been set
+luni.5D=SocketAddress is null
+luni.5E=Connection already established
+luni.5F=Already connected
+luni.60=different mode already set
+luni.61=scale value < than zero
+luni.62=Illegal IPv6 address
+luni.63=Scope id is not found for the given address
+luni.64=Invalid IP Address is neither 4 or 16 bytes
+luni.65=Invalid IP Address is neither 4 or 16 bytes\: {0}
+luni.66=Attempted to join a non-multicast group
+luni.67=No addresses associated with Interface
+luni.68=address is null
+luni.69=Attempted to leave a non-multicast group
+luni.6A=Address not associated with an interface - not set
+luni.6B=Cannot set network interface with null
+luni.6C=TimeToLive out of bounds
+luni.6D=interface name is null
+luni.6E=Illegal Proxy.Type or SocketAddress argument
+luni.6F=Socket is not bound
+luni.70=Socket implementation factory already set
+luni.71=Socket is already bound
+luni.72=Method has not been implemented
+luni.73=Proxy is null or invalid type
+luni.74=Socket input is shutdown
+luni.75=Socket output is shutdown
+luni.76=Attempted to set a negative SoLinger
+luni.77=Local port declared out of range
+luni.78=Socket is not connected
+luni.79=Urgent data not supported
+luni.7A=Invalid action specified\: {0}
+luni.7B=MinPort is greater than MaxPort\: {0}
+luni.7C=Invalid port number specified\: {0}
+luni.7D=Incomplete % sequence
+luni.7E=Invalid % sequence ({0})
+luni.7F=Illegal character
+luni.80=Incomplete % sequence at\: {0}
+luni.81=Invalid % sequence ({0}) at\: {1}
+luni.82=Relative path
+luni.83=Scheme expected
+luni.84=Scheme-specific part expected
+luni.85=Illegal character in scheme
+luni.86={0} in schemeSpecificPart
+luni.87={0} in authority
+luni.88={0} in path
+luni.89={0} in query
+luni.8A={0} in fragment
+luni.8B=Invalid port number
+luni.8C=Illegal character in userinfo
+luni.8D=Expected a closing square bracket for ipv6 address
+luni.8E=Malformed ipv6 address
+luni.8F=Illegal character in host name
+luni.90=Malformed ipv4 address
+luni.91=URI is not absolute
+luni.92={0} at index {1}\: {2}
+luni.93={0}\: {1}
+luni.94=One of urls is null
+luni.95=field is null
+luni.96=Does not support writing to the input stream
+luni.97=Does not support writing to the output stream
+luni.98=Duplicate Factory
+luni.99=Invalid parameter - {0}
+luni.9A=Attempt to set factory more than once.
+luni.9B=Protocol not found\: {0}
+luni.9C=Unknown protocol\: {0}
+luni.9D=proxy should not be null
+luni.9E=method has not been implemented yet
+luni.9F=Authority expected
+luni.A0=Expected host
+luni.A1=Package is sealed
+luni.A2=Mode must be one of "r" or "rw"
+luni.A3=size must be > 0
+luni.A4=Mark has been invalidated.
+luni.A5=BufferedReader is closed
+luni.A6=Invalid Mark.
+luni.A7=Writer is closed.
+luni.A8=size must be >\= 0
+luni.A9=CharArrayReader is closed.
+luni.AA=InputStream is null
+luni.AB=String is too long
+luni.AC=Number of bytes to skip cannot be negative
+luni.AD=URI is not absolute\: {0}
+luni.AE=URI is not hierarchical\: {0}
+luni.AF=Expected file scheme in URI\: {0}
+luni.B0=Expected non-empty path in URI\: {0}
+luni.B1=Found {0} component in URI\: {1}
+luni.B2=time must be positive
+luni.B3=No such file or directory
+luni.B4=Cannot create\: {0}
+luni.B5=Prefix must be at least 3 characters
+luni.B6=FileDescriptor is null
+luni.B7=actions invalid
+luni.B8=path is null
+luni.B9=invalid permission\: {0}
+luni.BA=InputStreamReader is closed.
+luni.BB=seek position is negative
+luni.BC=Wrong format\: 0x{0}
+luni.BD=Read an exception
+luni.BE=Unshared read of back reference
+luni.BF=Invalid typecode\: {0}
+luni.C0={2} - {0} not compatible with {1}
+luni.C1=Read null attempting to read class descriptor for an object
+luni.C2=Wrong base type in\: {0}
+luni.C3=Incompatible class (SUID)\: {0} but expected {1}
+luni.C4=IllegalAccessException
+luni.C5=Cannot read back reference to unshared object
+luni.C6=Callback object cannot be null
+luni.C7=Incompatible class (base name)\: {0} but expected {1}
+luni.C8=Cannot set protocol version when stream in use
+luni.C9=Error fetching SUID\: {0}
+luni.CA={0} computing SHA-1 / SUID
+luni.CB=Not connected
+luni.CC=InputStream is closed
+luni.CD=Write end dead
+luni.CE=Pipe broken
+luni.CF=Pipe is closed
+luni.D0=Pipe already connected
+luni.D1=Pipe Not Connected
+luni.D2=format is null
+luni.D3=Pushback buffer full
+luni.D4=Mark/Reset not supported
+luni.D5=Reader is closed
+luni.D6=StringReader is closed.
+luni.D7=Second byte at {0} does not match UTF8 Specification
+luni.D8=Third byte at {0} does not match UTF8 Specification
+luni.D9=Second or third byte at {0} does not match UTF8 Specification
+luni.DA=Input at {0} does not match UTF8 Specification
+luni.DB=File is null
+luni.DC=CharsetName is illegal
+luni.DD=ReadableByteChannel is null
+luni.DE=Radix {0} is less than Character.MIN_RADIX or greater than Character.MAX_RADIX
+luni.DF={0} is an illegal radix
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/process/ProcessInputStream.java Sun Feb 14 08:40:42 2010
@@ -20,7 +20,7 @@
import java.io.FileDescriptor;
import java.io.IOException;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
class ProcessInputStream extends java.io.InputStream {
@@ -123,12 +123,12 @@
return -1;
}
if (nbytes > buffer.length || nbytes < 0) {
- // K0031=Length out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K0031", nbytes)); //$NON-NLS-1$
+ // luni.18=Length out of bounds \: {0}
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.18", nbytes)); //$NON-NLS-1$
}
if (offset < 0 || offset > buffer.length - nbytes) {
- // K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset)); //$NON-NLS-1$
+ // luni.12=Offset out of bounds \: {0}
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset)); //$NON-NLS-1$
}
return readImpl(buffer, offset, nbytes, handle);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/internal/reflect/ProxyMethod.java Sun Feb 14 08:40:42 2010
@@ -19,7 +19,7 @@
import java.lang.reflect.Method;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
class ProxyMethod {
Method method;
@@ -86,7 +86,7 @@
// substitute returnType of method with that of otherMethod
method = otherMethod;
} else {
- throw new IllegalArgumentException(Msg.getString("K00f2",
+ throw new IllegalArgumentException(Messages.getString("luni.19",
method.getName()));
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainDatagramSocketImpl.java Sun Feb 14 08:40:42 2010
@@ -34,7 +34,7 @@
import org.apache.harmony.luni.platform.INetworkSystem;
import org.apache.harmony.luni.platform.Platform;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
import org.apache.harmony.luni.util.PriviAction;
/**
@@ -368,7 +368,7 @@
} catch (UnknownHostException e) {
// this is never expected to happen as we should not have gotten
// here if the address is not resolvable
- throw new SocketException(Msg.getString("K0317", inetAddr.getHostName())); //$NON-NLS-1$
+ throw new SocketException(Messages.getString("luni.1A", inetAddr.getHostName())); //$NON-NLS-1$
}
connectedPort = port;
isNativeConnected = true;
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/PlainSocketImpl.java Sun Feb 14 08:40:42 2010
@@ -38,7 +38,7 @@
import org.apache.harmony.luni.platform.INetworkSystem;
import org.apache.harmony.luni.platform.Platform;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* A concrete connected-socket implementation.
@@ -271,7 +271,7 @@
@Override
protected synchronized InputStream getInputStream() throws IOException {
if (!fd.valid()) {
- throw new SocketException(Msg.getString("K003d"));
+ throw new SocketException(Messages.getString("luni.0C"));
}
return new SocketInputStream(this);
@@ -298,7 +298,7 @@
@Override
protected synchronized OutputStream getOutputStream() throws IOException {
if (!fd.valid()) {
- throw new SocketException(Msg.getString("K003d")); //$NON-NLS-1$
+ throw new SocketException(Messages.getString("luni.0C")); //$NON-NLS-1$
}
return new SocketOutputStream(this);
}
@@ -394,7 +394,7 @@
}
} catch (Exception e) {
- throw new SocketException(Msg.getString("K003e", e)); //$NON-NLS-1$
+ throw new SocketException(Messages.getString("luni.0D", e)); //$NON-NLS-1$
}
socksRequestConnection(applicationServerAddress, applicationServerPort);
@@ -454,13 +454,13 @@
netImpl.connect(fd, trafficClass, socksGetServerAddress(),
socksGetServerPort());
} catch (Exception e) {
- throw new IOException(Msg.getString("K003f", e)); //$NON-NLS-1$
+ throw new IOException(Messages.getString("luni.0E", e)); //$NON-NLS-1$
}
// There must be a connection to an application host for the bind to
// work.
if (lastConnectedAddress == null) {
- throw new SocketException(Msg.getString("K0040")); //$NON-NLS-1$
+ throw new SocketException(Messages.getString("luni.0F")); //$NON-NLS-1$
}
// Use the last connected address and port in the bind request.
@@ -517,7 +517,7 @@
bytesRead += count;
}
if (Socks4Message.REPLY_LENGTH != bytesRead) {
- throw new SocketException(Msg.getString("KA011")); //$NON-NLS-1$
+ throw new SocketException(Messages.getString("luni.10")); //$NON-NLS-1$
}
return reply;
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketInputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketInputStream.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketInputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketInputStream.java Sun Feb 14 08:40:42 2010
@@ -22,7 +22,7 @@
import java.net.Socket;
import java.net.SocketImpl;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* The SocketInputStream supports the streamed reading of bytes from a socket.
@@ -70,7 +70,7 @@
@Override
public int read(byte[] buffer, int offset, int count) throws IOException {
if (null == buffer) {
- throw new IOException(Msg.getString("K0047"));//$NON-NLS-1$
+ throw new IOException(Messages.getString("luni.11"));//$NON-NLS-1$
}
if (0 == count) {
@@ -78,11 +78,11 @@
}
if (0 > offset || offset >= buffer.length) {
- // K002e=Offset out of bounds \: {0}
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002e", offset));//$NON-NLS-1$
+ // luni.12=Offset out of bounds \: {0}
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.12", offset));//$NON-NLS-1$
}
if (0 > count || offset + count > buffer.length) {
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002f"));//$NON-NLS-1$
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.13"));//$NON-NLS-1$
}
return socket.read(buffer, offset, count);
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketOutputStream.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketOutputStream.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketOutputStream.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/SocketOutputStream.java Sun Feb 14 08:40:42 2010
@@ -22,7 +22,7 @@
import java.net.Socket;
import java.net.SocketImpl;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
class SocketOutputStream extends OutputStream {
@@ -58,10 +58,10 @@
&& count <= buffer.length - offset) {
socket.write(buffer, offset, count);
} else {
- throw new ArrayIndexOutOfBoundsException(Msg.getString("K002f"));//$NON-NLS-1$
+ throw new ArrayIndexOutOfBoundsException(Messages.getString("luni.13"));//$NON-NLS-1$
}
} else {
- throw new NullPointerException(Msg.getString("K0047"));//$NON-NLS-1$
+ throw new NullPointerException(Messages.getString("luni.11"));//$NON-NLS-1$
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/Socks4Message.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/Socks4Message.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/Socks4Message.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/net/Socks4Message.java Sun Feb 14 08:40:42 2010
@@ -19,7 +19,7 @@
import java.io.UnsupportedEncodingException;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.luni.internal.nls.Messages;
class Socks4Message {
static final int COMMAND_CONNECT = 1;
@@ -162,13 +162,13 @@
public String getErrorString(int error) {
switch (error) {
case RETURN_FAILURE:
- return Msg.getString("K00cd"); //$NON-NLS-1$
+ return Messages.getString("luni.14"); //$NON-NLS-1$
case RETURN_CANNOT_CONNECT_TO_IDENTD:
- return Msg.getString("K00ce"); //$NON-NLS-1$
+ return Messages.getString("luni.15"); //$NON-NLS-1$
case RETURN_DIFFERENT_USER_IDS:
- return Msg.getString("K00cf"); //$NON-NLS-1$
+ return Messages.getString("luni.16"); //$NON-NLS-1$
default:
- return Msg.getString("K00d0"); //$NON-NLS-1$
+ return Messages.getString("luni.17"); //$NON-NLS-1$
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/ExternalMessages.properties Sun Feb 14 08:40:42 2010
@@ -327,3 +327,4 @@
K0031=Length out of bounds \: {0}
K0032=Source size {0} does not fit into destination
K0033=Start index ({0}) is greater than end index ({1})
+K0353=Unresolved address
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Msg.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Msg.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Msg.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Msg.java Sun Feb 14 08:40:42 2010
@@ -22,7 +22,7 @@
import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import org.apache.harmony.luni.util.MsgHelp;
+import org.apache.harmony.luni.internal.nls.Messages;
/**
* This class retrieves strings from a resource bundle and returns them,
@@ -37,7 +37,10 @@
* will be returned as the associated message. This means that the <em>KEY</em>
* should a reasonable human-readable (english) string.
*
+ * @deprecated use module specific message class such as {@link
+ * org.apache.harmony.luni.internal.nls.Message} for luni.
*/
+@Deprecated
public class Msg {
// ResourceBundle holding the system messages.
@@ -46,7 +49,7 @@
static {
// Attempt to load the messages.
try {
- bundle = MsgHelp.setLocale(Locale.getDefault(),
+ bundle = Messages.setLocale(Locale.getDefault(),
"org.apache.harmony.luni.util.ExternalMessages");
} catch (Throwable e) {
e.printStackTrace();
@@ -143,6 +146,6 @@
}
}
- return MsgHelp.format(format, args);
+ return Messages.format(format, args);
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/main/java/org/apache/harmony/luni/util/Util.java Sun Feb 14 08:40:42 2010
@@ -23,6 +23,7 @@
import java.io.UnsupportedEncodingException;
import java.util.Calendar;
import java.util.TimeZone;
+import org.apache.harmony.luni.internal.nls.Messages;
public final class Util {
@@ -234,25 +235,25 @@
s++;
else if (((a = out[s]) & 0xe0) == 0xc0) {
if (count >= utfSize)
- throw new UTFDataFormatException(Msg.getString("K0062",
+ throw new UTFDataFormatException(Messages.getString("luni.D7",
count));
int b = buf[count++];
if ((b & 0xC0) != 0x80)
- throw new UTFDataFormatException(Msg.getString("K0062",
+ throw new UTFDataFormatException(Messages.getString("luni.D7",
(count - 1)));
out[s++] = (char) (((a & 0x1F) << 6) | (b & 0x3F));
} else if ((a & 0xf0) == 0xe0) {
if (count + 1 >= utfSize)
- throw new UTFDataFormatException(Msg.getString("K0063",
+ throw new UTFDataFormatException(Messages.getString("luni.D8",
(count + 1)));
int b = buf[count++];
int c = buf[count++];
if (((b & 0xC0) != 0x80) || ((c & 0xC0) != 0x80))
- throw new UTFDataFormatException(Msg.getString("K0064",
+ throw new UTFDataFormatException(Messages.getString("luni.D9",
(count - 2)));
out[s++] = (char) (((a & 0x0F) << 12) | ((b & 0x3F) << 6) | (c & 0x3F));
} else {
- throw new UTFDataFormatException(Msg.getString("K0065",
+ throw new UTFDataFormatException(Messages.getString("luni.DA",
(count - 1)));
}
}
@@ -296,13 +297,13 @@
out.reset();
do {
if (i + 2 >= s.length())
- throw new IllegalArgumentException(Msg.getString(
- "K01fe", i));
+ throw new IllegalArgumentException(Messages.getString(
+ "luni.80", i));
int d1 = Character.digit(s.charAt(i + 1), 16);
int d2 = Character.digit(s.charAt(i + 2), 16);
if (d1 == -1 || d2 == -1)
- throw new IllegalArgumentException(Msg.getString(
- "K01ff", s.substring(i, i + 3), String
+ throw new IllegalArgumentException(Messages.getString(
+ "luni.81", s.substring(i, i + 3), String
.valueOf(i)));
out.write((byte) ((d1 << 4) + d2));
i += 3;
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/fdlibm.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/fdlibm.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/gp.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/gp.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hymagic.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hymagic.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hysocket.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hysocket.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/hyvmls.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/hyvmls.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jni_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jni_types.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmpi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmpi.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmri.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmri.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/jvmti_types.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/jvmti_types.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmi.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmi.h:803062-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/main/native/include/vmizip.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/include/vmizip.h:803062-909814
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=909986&r1=909985&r2=909986&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 Sun Feb 14 08:40:42 2010
@@ -542,7 +542,7 @@
}
JNIEXPORT jdouble JNICALL
-Java_java_lang_Math_pow (JNIEnv * env, jclass jclazz, jdouble arg1,
+Java_java_lang_Math_doPow (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=909986&r1=909985&r2=909986&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 Sun Feb 14 08:40:42 2010
@@ -82,7 +82,7 @@
Java_java_lang_Math_log1p
Java_java_lang_Math_nextafter
Java_java_lang_Math_nextafterf
-Java_java_lang_Math_pow
+Java_java_lang_Math_doPow
Java_java_lang_Math_rint
Java_java_lang_Math_sin
Java_java_lang_Math_sinh
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamFieldTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamFieldTest.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamFieldTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/io/ObjectStreamFieldTest.java Sun Feb 14 08:40:42 2010
@@ -26,6 +26,7 @@
import java.io.ObjectOutputStream;
import java.io.ObjectStreamClass;
import java.io.ObjectStreamField;
+import java.io.OutputStream;
import java.io.Serializable;
import java.io.StreamCorruptedException;
import java.util.Date;
@@ -221,6 +222,23 @@
assertEquals(1, objectStreamClass.getField("i").getOffset());
assertEquals(2, objectStreamClass.getField("s").getOffset());
}
+
+
+ /**
+ * Write/serialize and read/de-serialize an object with primitive field
+ */
+ public void test_ObjectWithPrimitiveField()
+ throws IOException, ClassNotFoundException {
+
+ final ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ final MyObjectOutputStream oos = new MyObjectOutputStream(baos);
+ oos.writeObject(new MockClass());
+ final byte[] bytes = baos.toByteArray();
+ final ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
+ final MyObjectInputStream ois = new MyObjectInputStream(bais);
+ // NullPointerException is thrown by the readObject call below.
+ ois.readObject();
+ }
/**
* Sets up the fixture, for example, open a network connection. This method
@@ -327,3 +345,51 @@
getField = in.readFields();
}
}
+
+
+// Primitive fields are necessary to cause the NullPointerException.
+class MockClass implements Serializable {
+ String str1 = "string 1";
+ String str2 = "string 2";
+ int int1 = 1;
+ int int2 = 2;
+ String str3 = "string 3";
+}
+
+
+// Overrides writeClassDescriptor to store ObjectStreamClass in map.
+class MyObjectOutputStream extends ObjectOutputStream {
+
+ // record the only ObjectStreamClass
+ static ObjectStreamClass descs;
+
+ MyObjectOutputStream(OutputStream out)
+ throws IOException {
+ super(out);
+ }
+
+ @Override
+ protected void writeClassDescriptor(ObjectStreamClass desc)
+ throws IOException {
+ descs = desc;
+ // Write a int
+ writeInt(1);
+ }
+}
+
+// Overrides readClassDescriptor to get ObjectStreamClass from map.
+class MyObjectInputStream extends ObjectInputStream {
+
+ MyObjectInputStream(InputStream in)
+ throws IOException {
+ super(in);
+ }
+
+ @Override
+ protected ObjectStreamClass readClassDescriptor()
+ throws IOException, ClassNotFoundException {
+ // Read a integer and get the only ObjectStreamClass for the test
+ final int id = readInt();
+ return MyObjectOutputStream.descs;
+ }
+}
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/MathTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/MathTest.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/MathTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/lang/MathTest.java Sun Feb 14 08:40:42 2010
@@ -1043,14 +1043,266 @@
*/
public void test_powDD() {
// Test for method double java.lang.Math.pow(double, double)
+ double NZERO = longTodouble(doubleTolong(0.0) ^ 0x8000000000000000L);
+ double p1 = 1.0;
+ double p2 = 2.0;
+ double p3 = 3.0;
+ double p4 = 4.0;
+ double p5 = 5.0;
+ double p6 = 6.0;
+ double p7 = 7.0;
+ double p8 = 8.0;
+ double p9 = 9.0;
+ double p10 = 10.0;
+ double p11 = 11.0;
+ double p12 = 12.0;
+ double p13 = 13.0;
+ double p14 = 14.0;
+ double p15 = 15.0;
+ double p16 = 16.0;
+ double[] values = { p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12,
+ p13, p14, p15, p16 };
+
+ for (int x = 0; x < values.length; x++) {
+ double dval = values[x];
+ double nagateDval = negateDouble(dval);
+ if (nagateDval == Double.NaN) {
+ continue;
+ }
+
+ // If the second argument is positive or negative zero, then the
+ // result is 1.0.
+ assertEquals("Result should be Math.pow(" + dval
+ + ",-0.0)=+1.0", 1.0, Math.pow(dval, NZERO));
+ assertEquals("Result should be Math.pow(" + nagateDval
+ + ",-0.0)=+1.0", 1.0, Math.pow(nagateDval, NZERO));
+ assertEquals("Result should be Math.pow(" + dval
+ + ",+0.0)=+1.0", 1.0, Math.pow(dval, +0.0));
+ assertEquals("Result should be Math.pow(" + nagateDval
+ + ",+0.0)=+1.0", 1.0, Math.pow(nagateDval, +0.0));
+
+ // If the second argument is 1.0, then the result is the same as the
+ // first argument.
+ assertEquals("Result should be Math.pow(" + dval + "," + 1.0 + ")="
+ + dval, dval, Math.pow(dval, 1.0));
+ assertEquals("Result should be Math.pow(" + nagateDval + "," + 1.0
+ + ")=" + nagateDval, nagateDval, Math.pow(nagateDval, 1.0));
+
+ // If the second argument is NaN, then the result is NaN.
+ assertEquals("Result should be Math.pow(" + dval + "," + Double.NaN
+ + ")=" + Double.NaN, Double.NaN, Math.pow(dval, Double.NaN));
+ assertEquals("Result should be Math.pow(" + nagateDval + ","
+ + Double.NaN + ")=" + Double.NaN, Double.NaN, Math.pow(nagateDval,
+ Double.NaN));
+
+ if (dval > 1) {
+ // If the first argument is NaN and the second argument is
+ // nonzero,
+ // then the result is NaN.
+ assertEquals("Result should be Math.pow(" + Double.NaN + ","
+ + dval + ")=" + Double.NaN, Double.NaN, Math.pow(Double.NaN, dval));
+ assertEquals("Result should be Math.pow(" + Double.NaN + ","
+ + nagateDval + ")=" + Double.NaN, Double.NaN, Math.pow(Double.NaN,
+ nagateDval));
+
+ /*
+ * If the first argument is positive zero and the second
+ * argument is greater than zero, or the first argument is
+ * positive infinity and the second argument is less than zero,
+ * then the result is positive zero.
+ */
+ assertEquals("Result should be Math.pow(" + 0.0 + "," + dval
+ + ")=" + 0.0, +0.0, Math.pow(0.0, dval));
+ assertEquals("Result should be Math.pow("
+ + Double.POSITIVE_INFINITY + "," + nagateDval + ")="
+ + 0.0, +0.0, Math.pow(Double.POSITIVE_INFINITY, nagateDval));
+
+ /*
+ * If the first argument is positive zero and the second
+ * argument is less than zero, or the first argument is positive
+ * infinity and the second argument is greater than zero, then
+ * the result is positive infinity.
+ */
+ assertEquals("Result should be Math.pow(" + 0.0 + ","
+ + nagateDval + ")=" + Double.POSITIVE_INFINITY,Double.POSITIVE_INFINITY,
+ Math.pow(0.0, nagateDval));
+ assertEquals("Result should be Math.pow("
+ + Double.POSITIVE_INFINITY + "," + dval + ")="
+ + Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Math.pow(
+ Double.POSITIVE_INFINITY, dval));
+
+ // Not a finite odd integer
+ if (dval % 2 == 0) {
+ /*
+ * If the first argument is negative zero and the second
+ * argument is greater than zero but not a finite odd
+ * integer, or the first argument is negative infinity and
+ * the second argument is less than zero but not a finite
+ * odd integer, then the result is positive zero.
+ */
+ assertEquals("Result should be Math.pow(" + NZERO + ","
+ + dval + ")=" + 0.0, +0.0, Math.pow(NZERO, dval));
+ assertEquals("Result should be Math.pow("
+ + Double.NEGATIVE_INFINITY + "," + nagateDval
+ + ")=" + 0.0, +0.0, Math.pow(Double.NEGATIVE_INFINITY,
+ nagateDval));
+
+ /*
+ * If the first argument is negative zero and the second
+ * argument is less than zero but not a finite odd integer,
+ * or the first argument is negative infinity and the second
+ * argument is greater than zero but not a finite odd
+ * integer, then the result is positive infinity.
+ */
+ assertEquals("Result should be Math.pow(" + NZERO + ","
+ + nagateDval + ")=" + Double.POSITIVE_INFINITY,Double.POSITIVE_INFINITY,
+ Math.pow(NZERO, nagateDval));
+ assertEquals("Result should be Math.pow("
+ + Double.NEGATIVE_INFINITY + "," + dval + ")="
+ + Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Math.pow(
+ Double.NEGATIVE_INFINITY, dval));
+ }
+
+ // finite odd integer
+ if (dval % 2 != 0) {
+ /*
+ * If the first argument is negative zero and the second
+ * argument is a positive finite odd integer, or the first
+ * argument is negative infinity and the second argument is
+ * a negative finite odd integer, then the result is
+ * negative zero.
+ */
+ assertEquals("Result should be Math.pow(" + NZERO + ","
+ + dval + ")=" + NZERO, NZERO, Math.pow(NZERO, dval));
+ assertEquals("Result should be Math.pow("
+ + Double.NEGATIVE_INFINITY + "," + nagateDval
+ + ")=" + NZERO, NZERO, Math.pow(Double.NEGATIVE_INFINITY,
+ nagateDval));
+ /*
+ * If the first argument is negative zero and the second
+ * argument is a negative finite odd integer, or the first
+ * argument is negative infinity and the second argument is
+ * a positive finite odd integer then the result is negative
+ * infinity.
+ */
+ assertEquals("Result should be Math.pow(" + NZERO + ","
+ + nagateDval + ")=" + Double.NEGATIVE_INFINITY,Double.NEGATIVE_INFINITY,
+ Math.pow(NZERO, nagateDval));
+ assertEquals("Result should be Math.pow("
+ + Double.NEGATIVE_INFINITY + "," + dval + ")="
+ + Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Math.pow(
+ Double.NEGATIVE_INFINITY, dval));
+ }
+
+ /**
+ * 1. If the first argument is finite and less than zero if the
+ * second argument is a finite even integer, the result is equal
+ * to the result of raising the absolute value of the first
+ * argument to the power of the second argument
+ *
+ * 2. if the second argument is a finite odd integer, the result is equal to the
+ * negative of the result of raising the absolute value of the
+ * first argument to the power of the second argument
+ *
+ * 3. if the second argument is finite and not an integer, then the result
+ * is NaN.
+ */
+ for (int j = 1; j < values.length; j++) {
+ double jval = values[j];
+ if (jval % 2.0 == 0.0) {
+ assertEquals("" + nagateDval + " " + jval, Math.pow(
+ dval, jval), Math.pow(nagateDval, jval));
+ } else {
+ assertEquals("" + nagateDval + " " + jval, -1.0
+ * Math.pow(dval, jval), Math.pow(nagateDval,
+ jval));
+ }
+ assertEquals(Double.NaN, Math
+ .pow(nagateDval, jval / 0.5467));
+ assertEquals(Double.NaN, Math.pow(nagateDval, -1.0 * jval
+ / 0.5467));
+ }
+ }
+
+ // If the absolute value of the first argument equals 1 and the
+ // second argument is infinite, then the result is NaN.
+ if (dval == 1) {
+ assertEquals("Result should be Math.pow(" + dval + ","
+ + Double.POSITIVE_INFINITY + ")=" + Double.NaN, Double.NaN, Math
+ .pow(dval, Double.POSITIVE_INFINITY));
+ assertEquals("Result should be Math.pow(" + dval + ","
+ + Double.NEGATIVE_INFINITY + ")=" + Double.NaN, Double.NaN, Math
+ .pow(dval, Double.NEGATIVE_INFINITY));
+
+ assertEquals("Result should be Math.pow(" + nagateDval + ","
+ + Double.POSITIVE_INFINITY + ")=" + Double.NaN, Double.NaN, Math
+ .pow(nagateDval, Double.POSITIVE_INFINITY));
+ assertEquals("Result should be Math.pow(" + nagateDval + ","
+ + Double.NEGATIVE_INFINITY + ")=" + Double.NaN, Double.NaN, Math
+ .pow(nagateDval, Double.NEGATIVE_INFINITY));
+ }
+
+ if (dval > 1) {
+ /*
+ * If the absolute value of the first argument is greater than 1
+ * and the second argument is positive infinity, or the absolute
+ * value of the first argument is less than 1 and the second
+ * argument is negative infinity, then the result is positive
+ * infinity.
+ */
+ assertEquals("Result should be Math.pow(" + dval + ","
+ + Double.POSITIVE_INFINITY + ")="
+ + Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Math.pow(dval,
+ Double.POSITIVE_INFINITY));
+
+ assertEquals("Result should be Math.pow(" + nagateDval + ","
+ + Double.NEGATIVE_INFINITY + ")="
+ + Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY, Math.pow(-0.13456,
+ Double.NEGATIVE_INFINITY));
+
+ /*
+ * If the absolute value of the first argument is greater than 1
+ * and the second argument is negative infinity, or the absolute
+ * value of the first argument is less than 1 and the second
+ * argument is positive infinity, then the result is positive
+ * zero.
+ */
+ assertEquals("Result should be Math.pow(" + dval + ","
+ + Double.NEGATIVE_INFINITY + ")= +0.0", +0.0, Math.pow(dval,
+ Double.NEGATIVE_INFINITY));
+ assertEquals("Result should be Math.pow(" + nagateDval + ","
+ + Double.POSITIVE_INFINITY + ")= +0.0", +0.0, Math.pow(
+ -0.13456, Double.POSITIVE_INFINITY));
+ }
+
+ assertEquals("Result should be Math.pow(" + 0.0 + "," + dval + ")="
+ + 0.0, 0.0, Math.pow(0.0, dval));
+ assertEquals("Result should be Math.pow(" + Double.NaN + "," + dval
+ + ")=" + Double.NaN, Double.NaN, Math.pow(Double.NaN, dval));
+ }
assertTrue("pow returned incorrect value",
(long) Math.pow(2, 8) == 256l);
assertTrue("pow returned incorrect value",
Math.pow(2, -8) == 0.00390625d);
assertEquals("Incorrect root returned1",
2, Math.sqrt(Math.pow(Math.sqrt(2), 4)), 0);
+
+ assertEquals(Double.NEGATIVE_INFINITY, Math.pow(-10.0, 3.093403029238847E15));
+ assertEquals(Double.POSITIVE_INFINITY, Math.pow(10.0, 3.093403029238847E15));
}
+ private double longTodouble(long longvalue) {
+ return Double.longBitsToDouble(longvalue);
+ }
+
+ private long doubleTolong(double doublevalue) {
+ return Double.doubleToLongBits(doublevalue);
+ }
+
+ private double negateDouble(double doublevalue) {
+ return doublevalue * -1.0;
+ }
+
/**
* @tests java.lang.Math#rint(double)
*/
Modified: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java Sun Feb 14 08:40:42 2010
@@ -916,12 +916,6 @@
}
}
- InetSocketAddress sa = InetSocketAddress.createUnresolved("localhost",
- 0);
- // no exception expected for next line
- new testDatagramSocket(new testDatagramSocketImpl())
- .send(new DatagramPacket(new byte[272], 3, sa));
-
// Regression test for Harmony-2938
InetAddress i = InetAddress.getByName("127.0.0.1");
DatagramSocket d = new DatagramSocket(0, i);
@@ -933,6 +927,16 @@
} finally {
d.close();
}
+
+ // Regression test for Harmony-6413
+ InetSocketAddress addr = InetSocketAddress.createUnresolved(
+ "localhost", 0);
+ try {
+ DatagramPacket dp = new DatagramPacket(new byte[272], 3, addr);
+ fail("should throw IllegalArgumentException");
+ } catch (IllegalArgumentException e) {
+ // expected
+ }
}
/**
Propchange: harmony/enhanced/classlib/branches/java6/modules/luni/src/test/resources/net.resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-901560
+/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/net.resources:790472-909814
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/DirectByteBuffer.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/DirectByteBuffer.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/DirectByteBuffer.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/DirectByteBuffer.java Sun Feb 14 08:40:42 2010
@@ -244,7 +244,7 @@
* freed then operations requiring access to the memory will throw an
* <code>IllegalStateException</code>.
* <p>
- * Note this is is possible that the memory is freed by code that reaches
+ * Note it is possible that the memory is freed by code that reaches
* into the address and explicitly frees it 'beneath' us -- this is bad
* form.
* </p>
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/channels/FileLock.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/channels/FileLock.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/channels/FileLock.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/java/nio/channels/FileLock.java Sun Feb 14 08:40:42 2010
@@ -202,7 +202,7 @@
buffer.append(size);
buffer.append(", shared=");
buffer.append(Boolean.toString(shared));
- buffer.append("]");
+ buffer.append(']');
return buffer.toString();
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/SocketChannelImpl.java Sun Feb 14 08:40:42 2010
@@ -47,7 +47,7 @@
import org.apache.harmony.luni.platform.INetworkSystem;
import org.apache.harmony.luni.platform.Platform;
import org.apache.harmony.luni.util.ErrorCodeException;
-import org.apache.harmony.luni.util.Msg;
+import org.apache.harmony.nio.internal.nls.Messages;
import org.apache.harmony.nio.AddressUtil;
import org.apache.harmony.nio.internal.nls.Messages;
@@ -910,7 +910,7 @@
throws SocketException {
checkOpen();
if (size < 1) {
- throw new IllegalArgumentException(Msg.getString("K0035")); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("nio.0E")); //$NON-NLS-1$
}
socketImpl
.setOption(SocketOptions.SO_RCVBUF, Integer.valueOf(size));
@@ -927,7 +927,7 @@
public synchronized void setSendBufferSize(int size) throws SocketException {
checkOpen();
if (size < 1) {
- throw new IllegalArgumentException(Msg.getString("K0035")); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("nio.0E")); //$NON-NLS-1$
}
socketImpl.setOption(SocketOptions.SO_SNDBUF, Integer.valueOf(size));
}
@@ -936,7 +936,7 @@
public void setSoLinger(boolean on, int timeout) throws SocketException {
checkOpen();
if (on && timeout < 0) {
- throw new IllegalArgumentException(Msg.getString("K0045")); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("nio.0F")); //$NON-NLS-1$
}
int val = on ? (65535 < timeout ? 65535 : timeout) : -1;
socketImpl.setOption(SocketOptions.SO_LINGER, Integer.valueOf(val));
@@ -946,7 +946,7 @@
public synchronized void setSoTimeout(int timeout) throws SocketException {
checkOpen();
if (timeout < 0) {
- throw new IllegalArgumentException(Msg.getString("K0036")); //$NON-NLS-1$
+ throw new IllegalArgumentException(Messages.getString("nio.10")); //$NON-NLS-1$
}
socketImpl.setOption(SocketOptions.SO_TIMEOUT, Integer.valueOf(timeout));
}
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/nls/messages.properties
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/nls/messages.properties?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/nls/messages.properties (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/main/java/common/org/apache/harmony/nio/internal/nls/messages.properties Sun Feb 14 08:40:42 2010
@@ -28,3 +28,6 @@
nio.0B=New position must be non-negative.
nio.0C=Offset out of bounds \: {0}
nio.0D=Length out of bounds \: {0}
+nio.0E=Zero or negative buffer size
+nio.0F=Attempted to set a negative SoLinger
+nio.10=Invalid negative timeout
Modified: harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.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/DatagramChannelTest.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/nio/src/test/java/common/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java Sun Feb 14 08:40:42 2010
@@ -1382,7 +1382,7 @@
public void testReceiveSend_8K() throws Exception {
StringBuffer str8k = new StringBuffer();
for (int i = 0; i < 8 * CAPACITY_1KB; i++) {
- str8k.append("a");
+ str8k.append('a');
}
String str = str8k.toString();
this.channel1.socket().bind(localAddr2);
@@ -1393,7 +1393,7 @@
public void testReceiveSend_64K() throws Exception {
StringBuffer str64k = new StringBuffer();
for (int i = 0; i < CAPACITY_64KB; i++) {
- str64k.append("a");
+ str64k.append('a');
}
String str = str64k.toString();
try {
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=909986&r1=909985&r2=909986&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 Sun Feb 14 08:40:42 2010
@@ -119,7 +119,7 @@
// -------------------------------------------------------------------
/*
- * Test method for 'com.ibm.io.nio.ServerSocketChannelImpl.socket()'
+ * Test method for 'java.nio.channels.ServerSocketChannel.socket()'
*/
public void testSocket_Block_BeforeClose() throws Exception {
assertTrue(this.serverChannel.isOpen());
@@ -200,7 +200,7 @@
// -------------------------------------------------------------------
/*
- * Test method for 'com.ibm.io.nio.ServerSocketChannelImpl.accept()'
+ * Test method for 'java.nio.channels.ServerSocketChannel.accept()'
*/
public void testAccept_Block_NotYetBound() throws IOException {
Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/depends/manifests/asm-3.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-901560
+/harmony/enhanced/classlib/trunk/modules/pack200/depends/manifests/asm-3.1:785554-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-901560
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200Adapter.java:782694-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-901560
+/harmony/enhanced/classlib/trunk/modules/pack200/src/main/java5/org/apache/harmony/pack200/Pack200PackerAdapter.java:782694-909814
Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/atoe.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/atoe.c?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/atoe.c (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/atoe.c Sun Feb 14 08:40:42 2010
@@ -293,7 +293,7 @@
}
/* Get the EBCIDC value from the system */
- e_name = a2e_string((char *)name);
+ e_name = a2e_string(name);
e_value = getenv(e_name);
free(e_name);
@@ -326,7 +326,7 @@
int result;
/* Set the system EBCDIC environment - don't free w_envstr as it's memory is held by the environment */
- w_envstr = a2e_string((char *)envstr);
+ w_envstr = a2e_string(envstr);
result = putenv(w_envstr);
if (result == 0) {
@@ -360,7 +360,7 @@
{
char *e;
- e = a2e_string((char *)string);
+ e = a2e_string(string);
perror(e);
free(e);
@@ -437,7 +437,7 @@
/* See if the file needs to be tagged */
tagFile = fileTagRequired(fname);
- f = a2e_string((char *)fname);
+ f = a2e_string(fname);
va_start(args,options);
@@ -479,7 +479,7 @@
{
char *tempfn = 0;
char *a = 0;
- char *d = a2e_string((char *)dir);
+ char *d = a2e_string(dir);
char *p = a2e_string(pfx);
if (( tempfn = tempnam(d,p)) == 0 ) {
@@ -508,7 +508,7 @@
int rc;
char *e;
- e = a2e_string((char *)pathname);
+ e = a2e_string(pathname);
rc = stat(e,sbuf);
free(e);
@@ -528,7 +528,7 @@
int rc;
char *e;
- e = a2e_string((char *)pathname);
+ e = a2e_string(pathname);
rc = lstat(e,sbuf);
free(e);
@@ -552,7 +552,7 @@
check_fcntl_init();
- f = a2e_string((char *)filename);
+ f = a2e_string(filename);
m = a2e_string(mode);
outfp = fopen(f,m);
@@ -584,7 +584,7 @@
check_fcntl_init();
- f = a2e_string((char *)filename);
+ f = a2e_string(filename);
m = a2e_string(mode);
outfp = freopen(f, m, stream);
@@ -614,7 +614,7 @@
int rc;
char *e;
- e = a2e_string((char *)pathname);
+ e = a2e_string(pathname);
rc = mkdir(e, mode);
free(e);
@@ -634,7 +634,7 @@
int rc;
char *e;
- e = a2e_string((char *)pathname);
+ e = a2e_string(pathname);
rc = remove(e);
free(e);
@@ -778,7 +778,7 @@
int rc;
char *e;
- e = a2e_string((char *)pathname);
+ e = a2e_string(pathname);
rc = unlink(e);
free(e);
@@ -799,7 +799,7 @@
int rc;
char *e;
- e = a2e_string((char *)pathname);
+ e = a2e_string(pathname);
rc = rmdir(e);
free(e);
@@ -820,7 +820,7 @@
int rc;
char *e;
- e = a2e_string((char *)pathname);
+ e = a2e_string(pathname);
rc = access(e, how);
free(e);
@@ -841,7 +841,7 @@
DIR *dir;
char *e;
- e = a2e_string((char *)dirname);
+ e = a2e_string(dirname);
dir = opendir(e);
free(e);
@@ -885,7 +885,7 @@
char e_resolved_name[MAXPATHLEN];
char *e_file_name, *p;
- e_file_name = a2e_string((char *)file_name);
+ e_file_name = a2e_string(file_name);
p = realpath(e_file_name, e_resolved_name);
if (p == NULL) return p;
@@ -904,12 +904,12 @@
* returns -
*************************************************************************/
int
-atoe_rename( const char *oldname, char *newname)
+atoe_rename(const char *oldname, const char *newname)
{
int rc;
char *o,*n;
- o = a2e_string((char *)oldname);
+ o = a2e_string(oldname);
n = a2e_string(newname);
rc = rename(o, n);
@@ -942,7 +942,7 @@
struct passwd *e_passwd;
char *e_name;
- e_name = a2e_string((char *)name);
+ e_name = a2e_string(name);
e_passwd = getpwnam(e_name);
free(e_name);
@@ -1251,8 +1251,8 @@
int
atoe_sscanf(const char *buffer, const char *format, va_list args)
{
- char *e_buffer = a2e_string((char *)buffer);
- char *e_format = a2e_string((char *)format);
+ char *e_buffer = a2e_string(buffer);
+ char *e_format = a2e_string(format);
int len = sscanf((const char *)e_buffer, (const char *)e_format, args);
free(e_buffer);
free(e_format);
@@ -1272,7 +1272,7 @@
size_t num;
char *e,*a;
- e = a2e_string((char *)format);
+ e = a2e_string(format);
num = strftime(buf, buflen, e, timeptr);
a = e2a(buf,num);
memcpy(buf,a,num);
@@ -1355,7 +1355,7 @@
{
char *eb, *result;
- eb = a2e_string((char *)locale);
+ eb = a2e_string(locale);
result = setlocale(category, eb) ;
return e2a_string(result);
@@ -1411,7 +1411,7 @@
char * pebcdic;
int i;
- sebcdic = a2e_string((char *)s);
+ sebcdic = a2e_string(s);
i = strtol((const char *)sebcdic, &pebcdic, b);
if (p != NULL) {
*p = (char *)s + (pebcdic - sebcdic);
@@ -1433,7 +1433,7 @@
char * pebcdic;
unsigned long i;
- sebcdic = a2e_string((char *)s);
+ sebcdic = a2e_string(s);
i = strtoul((const char *)sebcdic, &pebcdic, b);
if (p != NULL) {
*p = (char *)s + (pebcdic - sebcdic);
@@ -1455,7 +1455,7 @@
char * pebcdic;
unsigned long long i;
- sebcdic = a2e_string((char *)s);
+ sebcdic = a2e_string(s);
i = strtoull((const char *)sebcdic, &pebcdic, b);
if (p != NULL) {
*p = (char *)s + (pebcdic - sebcdic);
@@ -2274,7 +2274,7 @@
key_t key;
char *e;
- e = a2e_string((char *) pathname);
+ e = a2e_string(pathname);
key = ftok(e, id);
free(e);
Modified: harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/headers/stdio.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/headers/stdio.h?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/headers/stdio.h (original)
+++ harmony/enhanced/classlib/branches/java6/modules/portlib/src/main/native/a2e/unix/headers/stdio.h Sun Feb 14 08:40:42 2010
@@ -50,7 +50,7 @@
void atoe_perror (const char*);
int atoe_printf (const char*, ...);
int atoe_putchar (int);
- int atoe_rename (const char*, char*);
+ int atoe_rename (const char*, const char*);
int atoe_sprintf (const char*, char*, ...);
int std_sprintf (const char*, char*, ...);
int atoe_sscanf (const char*, const char*, ...);
Modified: harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/fortress/PolicyUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/fortress/PolicyUtils.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/fortress/PolicyUtils.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/security/src/main/java/common/org/apache/harmony/security/fortress/PolicyUtils.java Sun Feb 14 08:40:42 2010
@@ -322,7 +322,7 @@
* @param path -
* file path.
* @return - the resulting URI.
- * @throw URISyntaxException
+ * @throws URISyntaxException
*/
public static URI filePathToURI(String path) throws URISyntaxException {
path = path.replace(File.separatorChar, '/');
Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/SqlUtil.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/SqlUtil.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/SqlUtil.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/main/java/javax/sql/rowset/SqlUtil.java Sun Feb 14 08:40:42 2010
@@ -30,8 +30,10 @@
int modifiers = -1;
Field[] fields = Types.class.getFields();
for (int index = 0; index < fields.length; index++) {
+ // field should be int type
if (int.class == fields[index].getType()) {
modifiers = fields[index].getModifiers();
+ // field should be static and final
if (Modifier.isStatic(modifiers)
&& Modifier.isFinal(modifiers)) {
if (type == fields[index].getInt(Types.class)) {
Modified: harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java?rev=909986&r1=909985&r2=909986&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/rowset/RowSetMetaDataImplTest.java Sun Feb 14 08:40:42 2010
@@ -827,6 +827,13 @@
// expected
}
+ try {
+ metaDataImpl.setColumnType(2, 59);
+ fail("should throw SQLException");
+ } catch (SQLException e) {
+ // expected
+ }
+
// types compliant to JDBC4
metaDataImpl.setColumnType(2, Types.NCHAR);
metaDataImpl.setColumnType(2, Types.NCLOB);
Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-901560
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/BasicSwingTestCase.java:768152-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-901560
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/SwingTestCase.java:768152-909814
Propchange: harmony/enhanced/classlib/branches/java6/modules/swing/src/test/api/java.injected/javax/swing/text/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Feb 14 08:40:42 2010
@@ -1 +1 @@
-/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-901560
+/harmony/enhanced/classlib/trunk/modules/swing/src/test/api/java.injected/javax/swing/text/parser:768152-909814