|
14 | 14 | import java.util.Calendar;
|
15 | 15 | import java.util.Collections;
|
16 | 16 | import java.util.Comparator;
|
| 17 | +import java.util.ConcurrentModificationException; |
17 | 18 | import java.util.HashMap;
|
18 | 19 | import java.util.LinkedHashMap;
|
19 | 20 | import java.util.List;
|
20 | 21 | import java.util.Map;
|
21 | 22 |
|
22 | 23 | import com.mirth.connect.donkey.model.message.attachment.Attachment;
|
| 24 | +import com.mirth.connect.donkey.util.MapUtil; |
23 | 25 | import com.thoughtworks.xstream.annotations.XStreamAlias;
|
24 | 26 |
|
25 | 27 | @XStreamAlias("message")
|
@@ -114,62 +116,55 @@ public Map<Integer, ConnectorMessage> getConnectorMessages() {
|
114 | 116 | }
|
115 | 117 |
|
116 | 118 | public ConnectorMessage getMergedConnectorMessage() {
|
| 119 | + if (mergedConnectorMessage == null) { |
| 120 | + mergedConnectorMessage = new ConnectorMessage(); |
| 121 | + mergedConnectorMessage.setChannelId(channelId); |
| 122 | + mergedConnectorMessage.setMessageId(messageId); |
| 123 | + mergedConnectorMessage.setServerId(serverId); |
| 124 | + mergedConnectorMessage.setReceivedDate(receivedDate); |
| 125 | + |
| 126 | + Map<String, Object> sourceMap = null; |
| 127 | + Map<String, Object> responseMap = new HashMap<String, Object>(); |
| 128 | + Map<String, Object> channelMap = new HashMap<String, Object>(); |
| 129 | + |
| 130 | + ConnectorMessage sourceConnectorMessage = connectorMessages.get(0); |
| 131 | + |
| 132 | + if (sourceConnectorMessage != null) { |
| 133 | + mergedConnectorMessage.setRaw(sourceConnectorMessage.getRaw()); |
| 134 | + mergedConnectorMessage.setProcessedRaw(sourceConnectorMessage.getProcessedRaw()); |
| 135 | + sourceMap = sourceConnectorMessage.getSourceMap(); |
| 136 | + responseMap.putAll(sourceConnectorMessage.getResponseMap()); |
| 137 | + channelMap.putAll(sourceConnectorMessage.getChannelMap()); |
| 138 | + } |
117 | 139 |
|
118 |
| - if (mergedConnectorMessage != null) { |
119 |
| - return mergedConnectorMessage; |
120 |
| - } |
121 |
| - |
122 |
| - synchronized (this) { |
123 |
| - if (mergedConnectorMessage == null) { |
124 |
| - mergedConnectorMessage = new ConnectorMessage(); |
125 |
| - mergedConnectorMessage.setChannelId(channelId); |
126 |
| - mergedConnectorMessage.setMessageId(messageId); |
127 |
| - mergedConnectorMessage.setServerId(serverId); |
128 |
| - mergedConnectorMessage.setReceivedDate(receivedDate); |
129 |
| - |
130 |
| - Map<String, Object> sourceMap = null; |
131 |
| - Map<String, Object> responseMap = new HashMap<String, Object>(); |
132 |
| - Map<String, Object> channelMap = new HashMap<String, Object>(); |
133 |
| - |
134 |
| - ConnectorMessage sourceConnectorMessage = connectorMessages.get(0); |
135 |
| - |
136 |
| - if (sourceConnectorMessage != null) { |
137 |
| - mergedConnectorMessage.setRaw(sourceConnectorMessage.getRaw()); |
138 |
| - mergedConnectorMessage.setProcessedRaw(sourceConnectorMessage.getProcessedRaw()); |
139 |
| - sourceMap = sourceConnectorMessage.getSourceMap(); |
140 |
| - responseMap.putAll(sourceConnectorMessage.getResponseMap()); |
141 |
| - channelMap.putAll(sourceConnectorMessage.getChannelMap()); |
| 140 | + List<ConnectorMessage> orderedConnectorMessages = new ArrayList<ConnectorMessage>(connectorMessages.values()); |
| 141 | + Collections.sort(orderedConnectorMessages, new Comparator<ConnectorMessage>() { |
| 142 | + @Override |
| 143 | + public int compare(ConnectorMessage m1, ConnectorMessage m2) { |
| 144 | + if (m1.getChainId() == m2.getChainId()) { |
| 145 | + return m1.getOrderId() - m2.getOrderId(); |
| 146 | + } else { |
| 147 | + return m1.getChainId() - m2.getChainId(); |
| 148 | + } |
142 | 149 | }
|
| 150 | + }); |
143 | 151 |
|
144 |
| - List<ConnectorMessage> orderedConnectorMessages = new ArrayList<ConnectorMessage>(connectorMessages.values()); |
145 |
| - Collections.sort(orderedConnectorMessages, new Comparator<ConnectorMessage>() { |
146 |
| - @Override |
147 |
| - public int compare(ConnectorMessage m1, ConnectorMessage m2) { |
148 |
| - if (m1.getChainId() == m2.getChainId()) { |
149 |
| - return m1.getOrderId() - m2.getOrderId(); |
150 |
| - } else { |
151 |
| - return m1.getChainId() - m2.getChainId(); |
152 |
| - } |
153 |
| - } |
154 |
| - }); |
155 |
| - |
156 |
| - for (ConnectorMessage connectorMessage : orderedConnectorMessages) { |
157 |
| - if (connectorMessage.getMetaDataId() > 0) { |
158 |
| - if (sourceMap == null) { |
159 |
| - sourceMap = connectorMessage.getSourceMap(); |
160 |
| - } |
161 |
| - responseMap.putAll(connectorMessage.getResponseMap()); |
162 |
| - channelMap.putAll(connectorMessage.getChannelMap()); |
| 152 | + for (ConnectorMessage connectorMessage : orderedConnectorMessages) { |
| 153 | + if (connectorMessage.getMetaDataId() > 0) { |
| 154 | + if (sourceMap == null) { |
| 155 | + sourceMap = connectorMessage.getSourceMap(); |
163 | 156 | }
|
| 157 | + MapUtil.safePutAll(responseMap, connectorMessage.getResponseMap(), 5); |
| 158 | + MapUtil.safePutAll(channelMap, connectorMessage.getChannelMap(), 5); |
164 | 159 | }
|
165 |
| - |
166 |
| - mergedConnectorMessage.setSourceMap(sourceMap); |
167 |
| - mergedConnectorMessage.setResponseMap(responseMap); |
168 |
| - mergedConnectorMessage.setChannelMap(channelMap); |
169 | 160 | }
|
170 | 161 |
|
171 |
| - return mergedConnectorMessage; |
| 162 | + mergedConnectorMessage.setSourceMap(sourceMap); |
| 163 | + mergedConnectorMessage.setResponseMap(responseMap); |
| 164 | + mergedConnectorMessage.setChannelMap(channelMap); |
172 | 165 | }
|
| 166 | + |
| 167 | + return mergedConnectorMessage; |
173 | 168 | }
|
174 | 169 |
|
175 | 170 | public String toString() {
|
|
0 commit comments