You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2013/05/23 15:08:25 UTC
svn commit: r1485686 - in
/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons:
dbcp/PoolingConnection.java dbcp/cpdsadapter/PooledConnectionImpl.java
dbcp/datasources/InstanceKeyObjectFactory.java jocl/JOCLContentHandler.java
Author: ggregory
Date: Thu May 23 13:08:24 2013
New Revision: 1485686
URL: http://svn.apache.org/r1485686
Log:
Revert changes due to a -1 from pseitz.
Modified:
commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/PoolingConnection.java
commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyObjectFactory.java
commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/jocl/JOCLContentHandler.java
Modified: commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/PoolingConnection.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/PoolingConnection.java?rev=1485686&r1=1485685&r2=1485686&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/PoolingConnection.java (original)
+++ commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/PoolingConnection.java Thu May 23 13:08:24 2013
@@ -398,22 +398,22 @@ public class PoolingConnection extends D
PStmtKey(String sql, int resultSetType, int resultSetConcurrency) {
_sql = sql;
- _resultSetType = Integer.valueOf(resultSetType);
- _resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
+ _resultSetType = new Integer(resultSetType);
+ _resultSetConcurrency = new Integer(resultSetConcurrency);
}
PStmtKey(String sql, String catalog, int resultSetType, int resultSetConcurrency) {
_sql = sql;
_catalog = catalog;
- _resultSetType = Integer.valueOf(resultSetType);
- _resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
+ _resultSetType = new Integer(resultSetType);
+ _resultSetConcurrency = new Integer(resultSetConcurrency);
}
PStmtKey(String sql, String catalog, int resultSetType, int resultSetConcurrency, byte stmtType) {
_sql = sql;
_catalog = catalog;
- _resultSetType = Integer.valueOf(resultSetType);
- _resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
+ _resultSetType = new Integer(resultSetType);
+ _resultSetConcurrency = new Integer(resultSetConcurrency);
_stmtType = stmtType;
}
Modified: commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java?rev=1485686&r1=1485685&r2=1485686&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java (original)
+++ commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java Thu May 23 13:08:24 2013
@@ -536,21 +536,21 @@ class PooledConnectionImpl
PStmtKey(String sql, int resultSetType, int resultSetConcurrency) {
_sql = sql;
- _resultSetType = Integer.valueOf(resultSetType);
- _resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
+ _resultSetType = new Integer(resultSetType);
+ _resultSetConcurrency = new Integer(resultSetConcurrency);
}
PStmtKey(String sql, int autoGeneratedKeys) {
_sql = sql;
- _autoGeneratedKeys = Integer.valueOf(autoGeneratedKeys);
+ _autoGeneratedKeys = new Integer(autoGeneratedKeys);
}
PStmtKey(String sql, int resultSetType, int resultSetConcurrency,
int resultSetHoldability) {
_sql = sql;
- _resultSetType = Integer.valueOf(resultSetType);
- _resultSetConcurrency = Integer.valueOf(resultSetConcurrency);
- _resultSetHoldability = Integer.valueOf(resultSetHoldability);
+ _resultSetType = new Integer(resultSetType);
+ _resultSetConcurrency = new Integer(resultSetConcurrency);
+ _resultSetHoldability = new Integer(resultSetHoldability);
}
PStmtKey(String sql, int columnIndexes[]) {
Modified: commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyObjectFactory.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyObjectFactory.java?rev=1485686&r1=1485685&r2=1485686&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyObjectFactory.java (original)
+++ commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyObjectFactory.java Thu May 23 13:08:24 2013
@@ -52,7 +52,7 @@ abstract class InstanceKeyObjectFactory
if (obj instanceof String)
{
try {
- max = Math.max(max, Integer.valueOf((String)obj).intValue());
+ max = Math.max(max, new Integer((String)obj).intValue());
}
catch (NumberFormatException e) {
// no sweat, ignore those keys
Modified: commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/jocl/JOCLContentHandler.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/jocl/JOCLContentHandler.java?rev=1485686&r1=1485685&r2=1485686&view=diff
==============================================================================
--- commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/jocl/JOCLContentHandler.java (original)
+++ commons/proper/dbcp/branches/DBCP_1_4_x_BRANCH/src/java/org/apache/commons/jocl/JOCLContentHandler.java Thu May 23 13:08:24 2013
@@ -442,7 +442,7 @@ public class JOCLContentHandler extends
addObject(Boolean.TYPE,Boolean.valueOf(val));
} else if(ELT_BYTE.equals(localName)) {
byte val = Byte.parseByte(getAttributeValue(ATT_VALUE,attr,"0"));
- addObject(Byte.TYPE, Byte.valueOf(val));
+ addObject(Byte.TYPE, new Byte(val));
} else if(ELT_CHAR.equals(localName)) {
char val = '\u0000';
String valstr = getAttributeValue(ATT_VALUE,attr);
@@ -455,22 +455,22 @@ public class JOCLContentHandler extends
} else if(valstr.length()==0) {
throw new SAXException("if present, char value must be exactly one character long");
}
- addObject(Character.TYPE, Character.valueOf(val));
+ addObject(Character.TYPE, new Character(val));
} else if(ELT_DOUBLE.equals(localName)) {
double val = Double.parseDouble(getAttributeValue(ATT_VALUE,attr,"0"));
- addObject(Double.TYPE,Double.valueOf(val));
+ addObject(Double.TYPE, new Double(val));
} else if(ELT_FLOAT.equals(localName)) {
float val = Float.parseFloat(getAttributeValue(ATT_VALUE,attr,"0"));
- addObject(Float.TYPE,Float.valueOf(val));
+ addObject(Float.TYPE, new Float(val));
} else if(ELT_INT.equals(localName)) {
int val = Integer.parseInt(getAttributeValue(ATT_VALUE,attr,"0"));
- addObject(Integer.TYPE, Integer.valueOf(val));
+ addObject(Integer.TYPE, new Integer(val));
} else if(ELT_LONG.equals(localName)) {
long val = Long.parseLong(getAttributeValue(ATT_VALUE,attr,"0"));
- addObject(Long.TYPE, Long.valueOf(val));
+ addObject(Long.TYPE, new Long(val));
} else if(ELT_SHORT.equals(localName)) {
short val = Short.parseShort(getAttributeValue(ATT_VALUE,attr,"0"));
- addObject(Short.TYPE, Short.valueOf(val));
+ addObject(Short.TYPE, new Short(val));
} else if(ELT_STRING.equals(localName)) {
String val = getAttributeValue(ATT_VALUE,attr);
addObject("".getClass(),val);