提交 118bdec9 编写于 作者: S shroman

[ROCKETMQ-244] Message#putUserProperty uses == for String comparison.

Signed-off-by: Nshroman <rshtykh@yahoo.com>
上级 3672f70e
...@@ -81,12 +81,14 @@ public class Message implements Serializable { ...@@ -81,12 +81,14 @@ public class Message implements Serializable {
throw new RuntimeException(String.format( throw new RuntimeException(String.format(
"The Property<%s> is used by system, input another please", name)); "The Property<%s> is used by system, input another please", name));
} }
if (value == null || value == "" || value.trim() == ""
|| name == null || name == "" || name.trim() == "") { if (value == null || value.trim().isEmpty()
|| name == null || name.trim().isEmpty()) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"The name or value of property can not be null or blank string!" "The name or value of property can not be null or blank string!"
); );
} }
this.putProperty(name, value); this.putProperty(name, value);
} }
......
/*
* 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.rocketmq.common.message;
import org.junit.Assert;
import org.junit.Test;
import static org.apache.rocketmq.common.message.MessageConst.PROPERTY_TRACE_SWITCH;
import static org.junit.Assert.*;
public class MessageTest {
@Test(expected = RuntimeException.class)
public void putUserPropertyWithRuntimeException() throws Exception {
Message m = new Message();
m.putUserProperty(PROPERTY_TRACE_SWITCH, "");
}
@Test(expected = IllegalArgumentException.class)
public void putUserNullValuePropertyWithException() throws Exception {
Message m = new Message();
m.putUserProperty("prop1", null);
}
@Test(expected = IllegalArgumentException.class)
public void putUserEmptyValuePropertyWithException() throws Exception {
Message m = new Message();
m.putUserProperty("prop1", " ");
}
@Test(expected = IllegalArgumentException.class)
public void putUserNullNamePropertyWithException() throws Exception {
Message m = new Message();
m.putUserProperty(null, "val1");
}
@Test(expected = IllegalArgumentException.class)
public void putUserEmptyNamePropertyWithException() throws Exception {
Message m = new Message();
m.putUserProperty(" ", "val1");
}
@Test
public void putUserProperty() throws Exception {
Message m = new Message();
m.putUserProperty("prop1", "val1");
Assert.assertEquals("val1", m.getUserProperty("prop1"));
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册