You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/10/04 19:28:01 UTC
[1/2] incubator-beam git commit: Avoid losing the encoded
defaultValue.
Repository: incubator-beam
Updated Branches:
refs/heads/master 8462acbcb -> 087dcef1e
Avoid losing the encoded defaultValue.
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/0bd97efc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/0bd97efc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/0bd97efc
Branch: refs/heads/master
Commit: 0bd97efc0d764af17cdd8abdf43bff33bb21be2b
Parents: 8462acb
Author: Sela <an...@paypal.com>
Authored: Tue Oct 4 18:12:38 2016 +0300
Committer: Sela <an...@paypal.com>
Committed: Tue Oct 4 18:12:38 2016 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/beam/sdk/util/PCollectionViews.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/0bd97efc/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java
index 14ae5c8..3b1fde9 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java
@@ -261,10 +261,9 @@ public class PCollectionViews {
}
// Lazily decode the default value once
synchronized (this) {
- if (encodedDefaultValue != null) {
+ if (encodedDefaultValue != null && defaultValue == null) {
try {
defaultValue = CoderUtils.decodeFromByteArray(valueCoder, encodedDefaultValue);
- encodedDefaultValue = null;
} catch (IOException e) {
throw new RuntimeException("Unexpected IOException: ", e);
}
[2/2] incubator-beam git commit: This closes #1040
Posted by ke...@apache.org.
This closes #1040
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/087dcef1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/087dcef1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/087dcef1
Branch: refs/heads/master
Commit: 087dcef1efc6b7765e203f8aebfd3caf8c4a77de
Parents: 8462acb 0bd97ef
Author: Kenneth Knowles <kl...@google.com>
Authored: Tue Oct 4 12:27:22 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Oct 4 12:27:22 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/beam/sdk/util/PCollectionViews.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------