projects
/
mir.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed a tiny bug with the producer logger
[mir.git]
/
source
/
mir
/
storage
/
Database.java
diff --git
a/source/mir/storage/Database.java
b/source/mir/storage/Database.java
index
9f56efc
..
703e6e2
100755
(executable)
--- a/
source/mir/storage/Database.java
+++ b/
source/mir/storage/Database.java
@@
-253,8
+253,8
@@
public class Database implements StorageObject {
break;
case java.sql.Types.TIMESTAMP:
//Timestamp timestamp = (rs.getTimestamp(valueIndex));
break;
case java.sql.Types.TIMESTAMP:
//Timestamp timestamp = (rs.getTimestamp(valueIndex));
- //jbdc drops time zone info,
- //so just get the string from
+ //jbdc drops time zone info,
+ //so just get the string from
//postgres
String timestamp = (rs.getString(valueIndex));
if (!rs.wasNull()) {
//postgres
String timestamp = (rs.getString(valueIndex));
if (!rs.wasNull()) {
@@
-560,9
+560,10
@@
public class Database implements StorageObject {
int size = metadataFields.size();
for (int i = 0; i < size; i++) {
// alle durchlaufen bis nix mehr da
int size = metadataFields.size();
for (int i = 0; i < size; i++) {
// alle durchlaufen bis nix mehr da
+
theType = metadataTypes[i];
if (theType == java.sql.Types.LONGVARBINARY) {
theType = metadataTypes[i];
if (theType == java.sql.Types.LONGVARBINARY) {
-
InputStream us = rs.getAsciiStream(i + 1);
+
/*
InputStream us = rs.getAsciiStream(i + 1);
if (us != null) {
InputStreamReader is = new InputStreamReader(us);
char[] data = new char[32768];
if (us != null) {
InputStreamReader is = new InputStreamReader(us);
char[] data = new char[32768];
@@
-573,10
+574,13
@@
public class Database implements StorageObject {
}
is.close();
theResult = theResultString.toString();
}
is.close();
theResult = theResultString.toString();
+
+ theResult = null;
}
else {
theResult = null;
}
}
else {
theResult = null;
}
+*/ theResult = null;
}
else {
theResult = getValueAsString(rs, (i + 1), theType);
}
else {
theResult = getValueAsString(rs, (i + 1), theType);
@@
-598,14
+602,14
@@
public class Database implements StorageObject {
}
} catch (IllegalAccessException e) {
throwStorageObjectException("Kein Zugriff! -- " + e.toString());
}
} catch (IllegalAccessException e) {
throwStorageObjectException("Kein Zugriff! -- " + e.toString());
-
} catch (IOException e) {
+
/*
} catch (IOException e) {
throwStorageObjectException("IOException! -- " + e.toString());
throwStorageObjectException("IOException! -- " + e.toString());
-
} catch (InstantiationException e) {
+
*/
} catch (InstantiationException e) {
throwStorageObjectException("Keine Instantiiierung! -- " + e.toString());
throwStorageObjectException("Keine Instantiiierung! -- " + e.toString());
-
} catch (SQLException sqe) {
+
/*
} catch (SQLException sqe) {
throwSQLException(sqe, "makeEntityFromResultSet");
return null;
throwSQLException(sqe, "makeEntityFromResultSet");
return null;
-
}
+
*/
}
return returnEntity;
}
return returnEntity;
}