diff options
| author | Eike Stepper | 2012-08-15 07:06:35 +0000 |
|---|---|---|
| committer | Eike Stepper | 2012-08-15 07:06:35 +0000 |
| commit | 7eb4acd2f91f852946fb40ad647740dc69e8b69b (patch) | |
| tree | c41bce7ac0ad531ecd3b8fa77420b8ae88f03deb /plugins/org.eclipse.net4j.jvm | |
| parent | 7cc89ae0efe2ab1fd6d4ed071b4a6f96852ff336 (diff) | |
| download | cdo-7eb4acd2f91f852946fb40ad647740dc69e8b69b.tar.gz cdo-7eb4acd2f91f852946fb40ad647740dc69e8b69b.tar.xz cdo-7eb4acd2f91f852946fb40ad647740dc69e8b69b.zip | |
[259086] Protocol versions should be checked
https://bugs.eclipse.org/bugs/show_bug.cgi?id=259086
Diffstat (limited to 'plugins/org.eclipse.net4j.jvm')
| -rw-r--r-- | plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF | 10 | ||||
| -rw-r--r-- | plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java | 7 |
2 files changed, 10 insertions, 7 deletions
diff --git a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF index de25a752a7..3a6bc8ddbc 100644 --- a/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.jvm/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.net4j.jvm;singleton:=true -Bundle-Version: 4.1.0.qualifier +Bundle-Version: 4.1.100.qualifier Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -12,7 +12,7 @@ Bundle-ClassPath: . Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)";resolution:=optional, org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional -Export-Package: org.eclipse.net4j.internal.jvm;version="4.1.0";x-friends:="org.eclipse.net4j.defs,org.eclipse.net4j.tests,org.eclipse.net4j.ui", - org.eclipse.net4j.internal.jvm.bundle;version="4.1.0";x-internal:=true, - org.eclipse.net4j.internal.jvm.messages;version="4.1.0";x-internal:=true, - org.eclipse.net4j.jvm;version="4.1.0" +Export-Package: org.eclipse.net4j.internal.jvm;version="4.1.100";x-friends:="org.eclipse.net4j.defs,org.eclipse.net4j.tests,org.eclipse.net4j.ui", + org.eclipse.net4j.internal.jvm.bundle;version="4.1.100";x-internal:=true, + org.eclipse.net4j.internal.jvm.messages;version="4.1.100";x-internal:=true, + org.eclipse.net4j.jvm;version="4.1.100" diff --git a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java index 837f33869a..5b710183f1 100644 --- a/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java +++ b/plugins/org.eclipse.net4j.jvm/src/org/eclipse/net4j/internal/jvm/JVMConnector.java @@ -10,6 +10,7 @@ */ package org.eclipse.net4j.internal.jvm; +import org.eclipse.net4j.Net4jUtil; import org.eclipse.net4j.buffer.IBuffer; import org.eclipse.net4j.channel.ChannelException; import org.eclipse.net4j.internal.jvm.bundle.OM; @@ -115,8 +116,10 @@ public abstract class JVMConnector extends Connector implements IJVMConnector { try { - String protocolID = protocol == null ? null : protocol.getType(); - JVMChannel peerChannel = (JVMChannel)peer.inverseOpenChannel(channelID, protocolID); + String protocolID = Net4jUtil.getProtocolID(protocol); + int protocolVersion = Net4jUtil.getProtocolVersion(protocol); + + JVMChannel peerChannel = (JVMChannel)peer.inverseOpenChannel(channelID, protocolID, protocolVersion); if (peerChannel == null) { throw new ChannelException(Messages.getString("JVMConnector.2")); //$NON-NLS-1$ |