summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2018-05-16 00:28:18 -0400
committerEike Stepper2018-05-16 00:28:18 -0400
commitccfaf23f795c0e06a8c0953c40029ca6f7b02351 (patch)
treea485a7248e9678a2b40b9acffa55b2a4aacde063
parent5a38f1bf4091b5e40710e4cbd94b08eb840bb81b (diff)
downloadcdo-ccfaf23f795c0e06a8c0953c40029ca6f7b02351.zip
cdo-ccfaf23f795c0e06a8c0953c40029ca6f7b02351.tar.gz
cdo-ccfaf23f795c0e06a8c0953c40029ca6f7b02351.tar.xz
[533909] Unsettable features that are set to null can't be committed
https://bugs.eclipse.org/bugs/show_bug.cgi?id=533909
-rw-r--r--plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
index ae2d316..b84d388 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/common/protocol/CDOProtocolConstants.java
@@ -32,8 +32,9 @@ public interface CDOProtocolConstants
* @since 4.2
* @noreference This field is not intended to be referenced by clients.
*/
- public static final int PROTOCOL_VERSION = 35; // DiffieHellman.Server.Challenge.getSecretAlgorithmKeyLen()
+ public static final int PROTOCOL_VERSION = 36; // CDOID.NIL
+ // public static final int PROTOCOL_VERSION = 35; // DiffieHellman.Server.Challenge.getSecretAlgorithmKeyLen()
// public static final int PROTOCOL_VERSION = 34; // CDOSessionProtocol.loadMergeData2()
// public static final int PROTOCOL_VERSION = 33; // CDOCommitInfo.getMergeSource()
// public static final int PROTOCOL_VERSION = 32; // ROLLBACK_REASON_UNIT_INTEGRITY