Repository: cayenne Updated Branches: refs/heads/master ee021067a -> 27849ce59
CAY-2050 | Fast hack for Cayenne Crypto Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e9e1e73a Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e9e1e73a Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e9e1e73a Branch: refs/heads/master Commit: e9e1e73a9b5c39aae649a062996787a29f01070c Parents: b99c2b4 Author: Savva Kolbachev <s.kolbac...@gmail.com> Authored: Sat Jan 21 18:00:52 2017 +0300 Committer: Savva Kolbachev <s.kolbac...@gmail.com> Committed: Sat Jan 21 18:16:02 2017 +0300 ---------------------------------------------------------------------- .../crypto/transformer/DefaultBindingsTransformer.java | 1 + .../java/org/apache/cayenne/log/CommonsJdbcEventLogger.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/e9e1e73a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java ---------------------------------------------------------------------- diff --git a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java index e8aeb4b..4844795 100644 --- a/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java +++ b/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/transformer/DefaultBindingsTransformer.java @@ -46,6 +46,7 @@ public class DefaultBindingsTransformer implements BindingsTransformer { DbAttributeBinding b = bindings[positions[i]]; Object transformed = transformers[i].encrypt(encryptor, b.getValue()); b.setValue(transformed); + b.setExtendedType(null); // TODO fast hack } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/e9e1e73a/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java b/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java index c10daad..83994dc 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/log/CommonsJdbcEventLogger.java @@ -376,7 +376,12 @@ public class CommonsJdbcEventLogger implements JdbcEventLogger { } buffer.append(":"); - buffer.append(b.getExtendedType().toString(b.getValue())); + + if (b.getExtendedType() != null) { + buffer.append(b.getExtendedType().toString(b.getValue())); + } else { + buffer.append(b.getValue()); + } } if (hasIncluded) {
