Merge pull request #93 from jeanouii/jakarta-relocate
OPENJPA-2900 javax.xml.bind must be reloacted to jakarta namespace
diff --git a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
index 8ccaf77..025306b 100644
--- a/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
+++ b/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
@@ -1723,6 +1723,12 @@
else if (val instanceof LocalDateTime) {
setLocalDateTime(stmnt, idx, (LocalDateTime) val, col);
}
+ else if (val instanceof OffsetTime) {
+ setOffsetTime(stmnt, idx, (OffsetTime) val, col);
+ }
+ else if (val instanceof OffsetDateTime) {
+ setOffsetDateTime(stmnt, idx, (OffsetDateTime) val, col);
+ }
else if (val instanceof Reader)
setCharacterStream(stmnt, idx, (Reader) val,
(sized == null) ? 0 : sized.size, col);
diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
index 1afa7f2..5cc92f0 100644
--- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
+++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/Filters.java
@@ -375,7 +375,7 @@
} else if (o instanceof java.util.Date) {
return ((java.util.Date)o).toInstant().atZone(ZoneId.systemDefault()).toOffsetDateTime();
} else if (o instanceof CharSequence) {
- return LocalTime.parse((CharSequence) o);
+ return OffsetDateTime.parse((CharSequence) o);
}
}
