Skip to content

Commit

Permalink
fix: exception when write replace return itself
Browse files Browse the repository at this point in the history
  • Loading branch information
lo1nt committed Mar 20, 2024
1 parent da95611 commit d47dc51
Show file tree
Hide file tree
Showing 2 changed files with 147 additions and 5 deletions.
12 changes: 7 additions & 5 deletions src/main/java/com/caucho/hessian/io/JavaSerializer.java
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,16 @@ public void writeObject(Object obj, AbstractHessianOutput out)
try {
if (_writeReplace != null) {
Object repl = _writeReplace.invoke(obj, new Object[0]);
// for those writeReplaces that might return obj itself, no need to replace repl with obj
if (repl != obj) {

out.removeRef(obj);
out.removeRef(obj);

Check warning on line 152 in src/main/java/com/caucho/hessian/io/JavaSerializer.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/caucho/hessian/io/JavaSerializer.java#L152

Added line #L152 was not covered by tests

out.writeObject(repl);
out.writeObject(repl);

Check warning on line 154 in src/main/java/com/caucho/hessian/io/JavaSerializer.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/caucho/hessian/io/JavaSerializer.java#L154

Added line #L154 was not covered by tests

out.replaceRef(repl, obj);

return;
out.replaceRef(repl, obj);
return;

Check warning on line 157 in src/main/java/com/caucho/hessian/io/JavaSerializer.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/caucho/hessian/io/JavaSerializer.java#L156-L157

Added lines #L156 - L157 were not covered by tests
}
}
} catch (Exception e) {
log.log(Level.FINE, e.toString(), e);
Expand Down
140 changes: 140 additions & 0 deletions src/test/java/com/caucho/hessian/io/WriteReplaceTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.caucho.hessian.io;

import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.Serializable;

/**
*
* @author junyuan
* @version WriteReplaceTest.java, v 0.1 2024-03-20 10:34 junyuan Exp $
*/
public class WriteReplaceTest {
private static SerializerFactory factory;
private static ByteArrayOutputStream os;

@BeforeClass
public static void setUp() {
factory = new SerializerFactory();
os = new ByteArrayOutputStream();
}

@Test
public void TestWriteReplace() throws IOException {
TestObject origin = new TestObject();
origin.setName("testWR");

os.reset();
Hessian2Output output = new Hessian2Output(os);

output.setSerializerFactory(factory);
try {
output.writeObject(origin);
} catch (Exception e) {
Assert.fail("should be no exception");
}
output.flush();

ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
Hessian2Input input = new Hessian2Input(is);
input.setSerializerFactory(factory);
TestObject actual = (TestObject) input.readObject();
Assert.assertEquals(actual.name, origin.name);
}

@Test
public void TestWrappedWriteReplace() throws IOException {
WrappedTestObject origin = new WrappedTestObject();
TestObject testObject = new TestObject();
testObject.setName("testWR");
origin.setTestObject(testObject);

os.reset();
Hessian2Output output = new Hessian2Output(os);

output.setSerializerFactory(factory);
try {
output.writeObject(origin);
} catch (Exception e) {
Assert.fail("should be no exception");
}
output.flush();

ByteArrayInputStream is = new ByteArrayInputStream(os.toByteArray());
Hessian2Input input = new Hessian2Input(is);
input.setSerializerFactory(factory);
WrappedTestObject actual = (WrappedTestObject) input.readObject();
Assert.assertEquals(actual.testObject.name, origin.testObject.name);
}

private static class WrappedTestObject implements Serializable {
private TestObject testObject;

/**
* Getter method for property <tt>testObject</tt>.
*
* @return property value of testObject
*/
public TestObject getTestObject() {
return testObject;
}

/**
* Setter method for property <tt>testObject</tt>.
*
* @param testObject value to be assigned to property testObject
*/
public void setTestObject(TestObject testObject) {
this.testObject = testObject;
}
}

private static class TestObject implements Serializable {
private static final long serialVersionUID = -452701306050912437L;

String name;

Object writeReplace() {
return this;
}

/**
* Getter method for property <tt>name</tt>.
*
* @return property value of name
*/
public String getName() {
return name;
}

/**
* Setter method for property <tt>name</tt>.
*
* @param name value to be assigned to property name
*/
public void setName(String name) {
this.name = name;
}
}
}

0 comments on commit d47dc51

Please sign in to comment.