You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/06/28 16:40:19 UTC
camel git commit: CAMEL-11465: Fixed NPE in IrcMessage after recent
optimise in camel-core.
Repository: camel
Updated Branches:
refs/heads/master 77713509c -> 3cd744d6a
CAMEL-11465: Fixed NPE in IrcMessage after recent optimise in camel-core.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3cd744d6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3cd744d6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3cd744d6
Branch: refs/heads/master
Commit: 3cd744d6acb245171c27f1d0d3eae63bd86a9438
Parents: 7771350
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Jun 28 18:40:12 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Jun 28 18:40:12 2017 +0200
----------------------------------------------------------------------
.../apache/camel/component/irc/IrcEndpoint.java | 36 +++++---------------
.../apache/camel/component/irc/IrcMessage.java | 23 ++++++++-----
2 files changed, 23 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3cd744d6/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
index 79334cc..ab188d7 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcEndpoint.java
@@ -68,81 +68,63 @@ public class IrcEndpoint extends DefaultEndpoint {
public Exchange createOnPrivmsgExchange(String target, IRCUser user, String msg) {
Exchange exchange = createExchange();
- IrcMessage im = new IrcMessage("PRIVMSG", target, user, msg);
- im.setExchange(exchange);
- im.setCamelContext(exchange.getContext());
+ IrcMessage im = new IrcMessage(getCamelContext(), "PRIVMSG", target, user, msg);
exchange.setIn(im);
return exchange;
}
public Exchange createOnNickExchange(IRCUser user, String newNick) {
Exchange exchange = createExchange();
- IrcMessage im = new IrcMessage("NICK", user, newNick);
- im.setExchange(exchange);
- im.setCamelContext(exchange.getContext());
+ IrcMessage im = new IrcMessage(getCamelContext(), "NICK", user, newNick);
exchange.setIn(im);
return exchange;
}
public Exchange createOnQuitExchange(IRCUser user, String msg) {
Exchange exchange = createExchange();
- IrcMessage im = new IrcMessage("QUIT", user, msg);
- im.setExchange(exchange);
- im.setCamelContext(exchange.getContext());
+ IrcMessage im = new IrcMessage(getCamelContext(), "QUIT", user, msg);
exchange.setIn(im);
return exchange;
}
public Exchange createOnJoinExchange(String channel, IRCUser user) {
Exchange exchange = createExchange();
- IrcMessage im = new IrcMessage("JOIN", channel, user);
- im.setExchange(exchange);
- im.setCamelContext(exchange.getContext());
+ IrcMessage im = new IrcMessage(getCamelContext(), "JOIN", channel, user);
exchange.setIn(im);
return exchange;
}
public Exchange createOnKickExchange(String channel, IRCUser user, String whoWasKickedNick, String msg) {
Exchange exchange = createExchange();
- IrcMessage im = new IrcMessage("KICK", channel, user, whoWasKickedNick, msg);
- im.setExchange(exchange);
- im.setCamelContext(exchange.getContext());
+ IrcMessage im = new IrcMessage(getCamelContext(), "KICK", channel, user, whoWasKickedNick, msg);
exchange.setIn(im);
return exchange;
}
public Exchange createOnModeExchange(String channel, IRCUser user, IRCModeParser modeParser) {
Exchange exchange = createExchange();
- IrcMessage im = new IrcMessage("MODE", channel, user, modeParser.getLine());
- im.setExchange(exchange);
- im.setCamelContext(exchange.getContext());
+ IrcMessage im = new IrcMessage(getCamelContext(), "MODE", channel, user, modeParser.getLine());
exchange.setIn(im);
return exchange;
}
public Exchange createOnPartExchange(String channel, IRCUser user, String msg) {
Exchange exchange = createExchange();
- IrcMessage im = new IrcMessage("PART", channel, user, msg);
- im.setExchange(exchange);
- im.setCamelContext(exchange.getContext());
+ IrcMessage im = new IrcMessage(getCamelContext(), "PART", channel, user, msg);
exchange.setIn(im);
return exchange;
}
public Exchange createOnReplyExchange(int num, String value, String msg) {
Exchange exchange = createExchange();
- IrcMessage im = new IrcMessage("REPLY", num, value, msg);
- im.setExchange(exchange);
- im.setCamelContext(exchange.getContext());
+ IrcMessage im = new IrcMessage(getCamelContext(), "REPLY", num, value, msg);
exchange.setIn(im);
return exchange;
}
public Exchange createOnTopicExchange(String channel, IRCUser user, String topic) {
Exchange exchange = createExchange();
- IrcMessage im = new IrcMessage("TOPIC", channel, user, topic);
- im.setExchange(exchange);
- im.setCamelContext(exchange.getContext());
+ IrcMessage im = new IrcMessage(getCamelContext(), "TOPIC", channel, user, topic);
exchange.setIn(im);
return exchange;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3cd744d6/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
----------------------------------------------------------------------
diff --git a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
index 1b3360a..160ee0d 100644
--- a/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
+++ b/components/camel-irc/src/main/java/org/apache/camel/component/irc/IrcMessage.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.irc;
import java.util.Map;
+import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
import org.apache.camel.impl.DefaultMessage;
import org.apache.camel.util.ExchangeHelper;
@@ -32,17 +33,20 @@ public class IrcMessage extends DefaultMessage {
private int num;
private String value;
- public IrcMessage() {
+ public IrcMessage(CamelContext camelContext) {
+ super(camelContext);
}
- public IrcMessage(String messageType, IRCUser user, String message) {
+ public IrcMessage(CamelContext camelContext, String messageType, IRCUser user, String message) {
+ super(camelContext);
this.messageType = messageType;
this.user = user;
this.message = message;
setBody(message);
}
- public IrcMessage(String messageType, String target, IRCUser user, String message) {
+ public IrcMessage(CamelContext camelContext, String messageType, String target, IRCUser user, String message) {
+ super(camelContext);
this.messageType = messageType;
this.target = target;
this.user = user;
@@ -50,7 +54,8 @@ public class IrcMessage extends DefaultMessage {
setBody(message);
}
- public IrcMessage(String messageType, String target, IRCUser user, String whoWasKickedNick, String message) {
+ public IrcMessage(CamelContext camelContext, String messageType, String target, IRCUser user, String whoWasKickedNick, String message) {
+ super(camelContext);
this.messageType = messageType;
this.target = target;
this.user = user;
@@ -59,13 +64,15 @@ public class IrcMessage extends DefaultMessage {
setBody(message);
}
- public IrcMessage(String messageType, String target, IRCUser user) {
+ public IrcMessage(CamelContext camelContext, String messageType, String target, IRCUser user) {
+ super(camelContext);
this.messageType = messageType;
this.target = target;
this.user = user;
}
- public IrcMessage(String messageType, int num, String value, String message) {
+ public IrcMessage(CamelContext camelContext, String messageType, int num, String value, String message) {
+ super(camelContext);
this.messageType = messageType;
this.num = num;
this.value = value;
@@ -122,9 +129,7 @@ public class IrcMessage extends DefaultMessage {
@Override
public IrcMessage newInstance() {
- IrcMessage answer = new IrcMessage();
- answer.setCamelContext(getCamelContext());
- return answer;
+ return new IrcMessage(getCamelContext());
}
@Override