CriteriaBuilderImpl fix revert and code improvement in DatabaseAccessor to fix JPA.WDF tests. (#984)

Signed-off-by: Radek Felcman <[email protected]>

Author: rfelcman

foundation/org.eclipse.persistence.core/src/main/java/org/eclipse/persistence/internal/databaseaccess/DatabaseAccessor.java

@@ -1383,8 +1383,9 @@ protected Object getObjectThroughOptimizedDataConversion(ResultSet resultSet, Da
         } else if ((fieldType == ClassConstants.SHORT) || (fieldType == ClassConstants.PSHORT)) {
             value = Short.valueOf(resultSet.getShort(columnNumber));
             isPrimitive = ((Short)value).shortValue() == 0;
-        } else if (fieldType == ClassConstants.BOOLEAN) {
-            value = resultSet.getBoolean(columnNumber);
+        } else if ((fieldType == ClassConstants.BOOLEAN) || (fieldType == ClassConstants.PBOOLEAN))  {
+            value = Boolean.valueOf(resultSet.getBoolean(columnNumber));
+            isPrimitive = ((Boolean)value).booleanValue() == false;
         } else if ((type == Types.TIME) || (type == Types.DATE) || (type == Types.TIMESTAMP)) {
             if (Helper.shouldOptimizeDates) {
                 // Optimize dates by avoid conversion to timestamp then back to date or time or util.date.

jpa/org.eclipse.persistence.jpa/src/main/java/org/eclipse/persistence/internal/jpa/querydef/CriteriaBuilderImpl.java

@@ -1407,7 +1407,6 @@ public Expression<BigInteger> toBigInteger(Expression<? extends Number> number){
     @Override
     public Expression<String> toString(Expression<Character> character){
         ExpressionImpl impl = (ExpressionImpl) character;
-        impl.javaType = ClassConstants.STRING;
         return impl;
     }