java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java | 7 ++++++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
New commits:
commit b0d511a2f9f5d3de406eec8d90a16a935beb2e11
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 6 13:16:26 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.124-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 514b8f7..102293e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.123
+Version: 1.8.124
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Aug 06 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.124-1
+- detect oracle TIMESTAMPTZ objects and convert them correctly to timestamp
+
* Thu Aug 02 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.123-1
- 842992 - display a relevant error message when creating channel names/labels
starting with rhn|redhat
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index aa14393..762dec9 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.123-1 java/
+1.8.124-1 java/
commit 8999ccc7daf750fe7df7f0bee348b3fd45bda0c4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Aug 6 11:41:29 2012 +0200
detect oracle TIMESTAMPTZ objects and convert them correctly to timestamp
addressing future possible tracebacks:
com.redhat.rhn.common.util.MethodNotFoundException: Could not find method called:
setModified in class:
com.redhat.rhn.frontend.dto.SystemOverview with params: [type: oracle.sql.TIMESTAMPTZ,
value: oracle.sql.TIMESTAMPTZ@3553d71d]
at com.redhat.rhn.common.util.MethodUtil.callMethod(MethodUtil.java:196)
at
com.redhat.rhn.common.db.datasource.CachedStatement.addToObject(CachedStatement.java:751)
at
com.redhat.rhn.common.db.datasource.CachedStatement.processResultSet(CachedStatement.java:602)
at
com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:460)
at
com.redhat.rhn.common.db.datasource.CachedStatement.executeElaboratorBatch(CachedStatement.java:371)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
index 7133ec1..a5d3852 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/CachedStatement.java
@@ -768,12 +768,17 @@ public class CachedStatement {
*/
private Object getObject(ResultSet rs, String columnName) throws SQLException {
Object columnValue = rs.getObject(columnName);
+ if (columnValue == null) {
+ return null;
+ }
+
// Workaround for problem where the JDBC driver returns a
// java.sql.Date that often times will not deliver time
// precision beyond 12:00AM Midnight so you get dates like
// this : August 23, 2005 12:00:00 AM PDT
// vs the real date: August 23, 2005 1:36:12 PM PDT
- if (columnValue instanceof Date) {
+ if (columnValue instanceof Date ||
+
("oracle.sql.TIMESTAMPTZ".equals(columnValue.getClass().getCanonicalName()))) {
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("GMT"));
return rs.getTimestamp(columnName, cal);
}