Skip to content
Permalink
Browse files
Correct is_custom information sent in FVD
  • Loading branch information
ngmr committed Jun 8, 2015
1 parent 5a31410 commit f7781dca3f1413413bc1f07dc0d843dd5c69b51e
Showing 4 changed files with 10 additions and 7 deletions.
@@ -18,6 +18,7 @@
package org.apache.yoko.orb.OB;

import org.apache.yoko.orb.OCI.GiopVersion;
import org.omg.SendingContext.CodeBaseHelper;

final class GIOPClient extends Client {
protected ORBInstance orbInstance_; // The ORB instance
@@ -285,7 +286,7 @@ private void initServiceContexts() {
if (codeBaseSC_ == null) {

javax.rmi.CORBA.ValueHandler valueHandler = javax.rmi.CORBA.Util.createValueHandler();
org.omg.SendingContext.CodeBase codeBase = (org.omg.SendingContext.CodeBase) valueHandler.getRunTimeCodeBase();
org.omg.SendingContext.CodeBase codeBase = CodeBaseHelper.narrow(valueHandler.getRunTimeCodeBase());


org.apache.yoko.orb.OCI.Buffer buf = new org.apache.yoko.orb.OCI.Buffer();
@@ -480,7 +480,7 @@ private void writeRMIValue(Serializable value, String id) {
//
// Determine if chunked encoding is needed.
//
boolean isChunked = valueHandler.isCustomMarshaled (clz);
boolean isChunked = valueHandler.isCustomMarshaled(clz);

int pos = beginValue (tag, ids, codebase, isChunked);
instanceTable_.put (value, new Integer (pos));
@@ -445,11 +445,12 @@ public void write(OutputStream out, Object value) {
}

public boolean isCustomMarshalled() {
if ((_is_externalizable || (_write_object_method != null)))
return true;

return (_super_descriptor != null) && _super_descriptor.isCustomMarshalled();
return (_is_externalizable || (_write_object_method != null));
}

public boolean isChunked() {
if (isCustomMarshalled()) return true;
return (_super_descriptor != null) && _super_descriptor.isChunked();
}

public Serializable writeReplace(Serializable val) {
@@ -131,8 +131,9 @@ public java.lang.String getRMIRepositoryID(java.lang.Class clz) {
return getRepository().getDescriptor(clz).getRepositoryID();
}

@Override
public boolean isCustomMarshaled(java.lang.Class clz) {
return desc(clz).isCustomMarshalled();
return desc(clz).isChunked();
}

public synchronized org.omg.SendingContext.RunTime getRunTimeCodeBase() {

0 comments on commit f7781dc

Please sign in to comment.