Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dubbo-3727] Fix NullPointerException when protocoluff protocol serializes an empty object #3734

Merged
merged 5 commits into from
Mar 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void writeObject(Object obj) throws IOException {
byte[] classNameBytes;

try {
if (WrapperUtils.needWrapper(obj)) {
if (obj == null || WrapperUtils.needWrapper(obj)) {
Schema<Wrapper> schema = RuntimeSchema.getSchema(Wrapper.class);
Wrapper wrapper = new Wrapper(obj);
bytes = GraphIOUtil.toByteArray(wrapper, schema, buffer);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
/*
* 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 org.apache.dubbo.common.serialize.protostuff;
kexianjun marked this conversation as resolved.
Show resolved Hide resolved

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.nullValue;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

public class ProtostuffObjectOutputTest {

private ByteArrayOutputStream byteArrayOutputStream;
private ProtostuffObjectOutput protostuffObjectOutput;
private ProtostuffObjectInput protostuffObjectInput;
private ByteArrayInputStream byteArrayInputStream;

@BeforeEach
public void setUp() throws Exception {
this.byteArrayOutputStream = new ByteArrayOutputStream();
this.protostuffObjectOutput = new ProtostuffObjectOutput(byteArrayOutputStream);
}

@Test
public void testWriteObjectNull() throws IOException, ClassNotFoundException {
this.protostuffObjectOutput.writeObject(null);
this.flushToInput();

assertThat(protostuffObjectInput.readObject(), nullValue());
}

private void flushToInput() throws IOException {
this.protostuffObjectOutput.flushBuffer();
this.byteArrayInputStream = new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
this.protostuffObjectInput = new ProtostuffObjectInput(byteArrayInputStream);
}
}