You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2011/09/03 01:02:18 UTC
svn commit: r1164755 - in /db/derby/code/branches/10.8: ./
java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
java/drda/org/apache/derby/impl/drda/DRDAStatement.java
Author: myrnavl
Date: Fri Sep 2 23:02:17 2011
New Revision: 1164755
URL: http://svn.apache.org/viewvc?rev=1164755&view=rev
Log:
DERBY-5287; tasks for 10.8.2 release
backport of revision 1163616 for DERBY-5396 from trunk to 10.8
Modified:
db/derby/code/branches/10.8/ (props changed)
db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 2 23:02:17 2011
@@ -1,2 +1,2 @@
/db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1164358,1164370
+/db/derby/code/trunk:1063809,1088633,1089795,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1095247,1096741,1096890,1096991,1097247,1097249,1097460,1097469,1097471,1098033,1101059,1101839,1102620,1102826,1103681,1103718,1103742,1125305,1126358,1126468,1127825,1127883,1128243,1128942,1129136,1129764,1129797,1130077,1130084,1130632,1130895,1131030,1131272,1132546,1132664,1132747,1132860,1132928,1133304,1133317,1133741,1133752,1134139,1136363,1136371,1136397,1136844,1137213,1138201,1138341,1138444,1138787,1138795,1139449,1139451,1140222,1140744,1141924,1142583,1142635,1145057,1146644,1146915,1146962,1147219,1147242,1147335,1148344,1148354,1148429,1148658,1149054,1149090,1149270,1149482,1149662,1151101,1151612,1158108,1160593,1160597,1161208,1163616,1164358,1164370
Modified: db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java?rev=1164755&r1=1164754&r2=1164755&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java (original)
+++ db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAConnThread.java Fri Sep 2 23:02:17 2011
@@ -8950,18 +8950,21 @@ class DRDAConnThread extends Thread {
}
-
- private static void closeStream(InputStream stream){
-
- try{
- if (stream != null)
- stream.close();
-
- } catch (IOException e) {
- Util.javaException(e);
-
- }
-
+ /**
+ * Close a stream.
+ *
+ * @param stream the stream to close (possibly {@code null})
+ * @throws SQLException wrapped around an {@code IOException} if closing
+ * the stream failed
+ */
+ private static void closeStream(InputStream stream) throws SQLException {
+ try {
+ if (stream != null) {
+ stream.close();
+ }
+ } catch (IOException e) {
+ throw Util.javaException(e);
+ }
}
Modified: db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAStatement.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAStatement.java?rev=1164755&r1=1164754&r2=1164755&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAStatement.java (original)
+++ db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/DRDAStatement.java Fri Sep 2 23:02:17 2011
@@ -678,7 +678,7 @@ class DRDAStatement
try {
drdaParamState_.drainStreamedParameter();
} catch (IOException e) {
- Util.javaException(e);
+ throw Util.javaException(e);
}
// java.sql.Statement says any result sets that are opened
// when the statement is re-executed must be closed; this