Skip to content

Commit 32be387

Browse files
committed
Checking for null certs.
1 parent 6f9a792 commit 32be387

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/main/java/org/fogbowcloud/rendezvous/xmpp/RendezvousPacketHelper.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ public static RendezvousItem getWhoIsAliveResponseItem(
6161
Element itemEl) throws ParseException {
6262
Attribute id = itemEl.attribute("id");
6363
Element statusEl = itemEl.element("status");
64-
String cert = itemEl.element("cert").getText();
64+
Element certEl = itemEl.element("cert");
65+
String cert = certEl == null ? null : certEl.getText();
6566
String cpuIdle = statusEl.element("cpu-idle").getText();
6667
String cpuInUse = statusEl.element("cpu-inuse").getText();
6768
String memIdle = statusEl.element("mem-idle").getText();

src/main/java/org/fogbowcloud/rendezvous/xmpp/handler/WhoIsAliveHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.fogbowcloud.rendezvous.xmpp.handler;
22

33
import java.util.List;
4-
import java.util.concurrent.locks.Condition;
54

65
import org.dom4j.Element;
76
import org.fogbowcloud.rendezvous.core.Rendezvous;

src/main/java/org/fogbowcloud/rendezvous/xmpp/handler/WhoIsAliveSyncHandler.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,10 @@ private IQ createResponse(IQ iq, RendezvousImpl rendezvousImpl,
9696
RendezvousItem item = (RendezvousItem) rsmItem;
9797
Element managerEl = managersEl.addElement("manager");
9898
managerEl.addAttribute("id", item.getResourcesInfo().getId());
99-
managerEl.addElement("cert").setText(
100-
item.getResourcesInfo().getCert());
99+
String cert = item.getResourcesInfo().getCert();
100+
if (cert != null) {
101+
managerEl.addElement("cert").setText(cert);
102+
}
101103
Element statusEl = managerEl.addElement("status");
102104
statusEl.addElement("cpu-idle").setText(
103105
item.getResourcesInfo().getCpuIdle());

0 commit comments

Comments
 (0)