public/openhab-addons
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[infrastructure] add external null-annotations (#8848)

Browse Source 
Signed-off-by: Jan N. Klug <jan.n.klug@rub.de>
This commit is contained in:
J-N-K
2020-10-31 00:29:03 +01:00
committed by GitHub
parent 47d05055db
commit bd664ff0c8
162 changed files with 933 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/SonosXMLParser.java
View File

@@ -328,7 +328,7 @@ public class SonosXMLParser {
@Override
public void characters(char @Nullable [] ch, int start, int length) throws SAXException {
Element elt = element;
if (elt == null) {
if (elt == null || ch == null) {
return;
}
switch (elt) {
@@ -446,7 +446,7 @@ public class SonosXMLParser {
@Override
public void characters(char @Nullable [] ch, int start, int length) throws SAXException {
Element elt = element;
if (elt == null) {
if (elt == null || ch == null) {
return;
}
switch (elt) {
@@ -530,9 +530,17 @@ public class SonosXMLParser {
boolean finalIncludeLinkedZones = !"0".equals(includeLinkedZones);
try {
String id = this.id;
if (id == null) {
throw new NumberFormatException();
}
finalID = Integer.parseInt(id);
String volume = this.volume;
if (volume == null) {
throw new NumberFormatException();
}
finalVolume = Integer.parseInt(volume);
} catch (Exception e) {
} catch (NumberFormatException e) {
LOGGER.debug("Error parsing Integer");
}
@@ -790,7 +798,7 @@ public class SonosXMLParser {
@Override
public void characters(char @Nullable [] ch, int start, int length) throws SAXException {
CurrentElement elt = currentElement;
if (elt == null) {
if (elt == null || ch == null) {
return;
}
switch (elt) {
@@ -875,7 +883,7 @@ public class SonosXMLParser {
@Override
public void characters(char @Nullable [] ch, int start, int length) throws SAXException {
if (getPresetName) {
if (getPresetName && ch != null) {
presetName = new String(ch, start, length);
}
}
@@ -944,7 +952,7 @@ public class SonosXMLParser {
@Override
public void characters(char @Nullable [] ch, int start, int length) throws SAXException {
if (roomNameTag) {
if (roomNameTag && ch != null) {
roomName = new String(ch, start, length);
roomNameTag = false;
}
@@ -983,7 +991,7 @@ public class SonosXMLParser {
@Override
public void characters(char @Nullable [] ch, int start, int length) throws SAXException {
if (modelNameTag) {
if (modelNameTag && ch != null) {
modelName = new String(ch, start, length);
modelNameTag = false;
}

6
bundles/org.openhab.binding.sonos/src/main/java/org/openhab/binding/sonos/internal/handler/ZonePlayerHandler.java
View File

@@ -1393,7 +1393,11 @@ public class ZonePlayerHandler extends BaseThingHandler implements UpnpIOPartici
}
try {
result = Long.valueOf(resultInput.get(requestedKey));
String resultString = resultInput.get(requestedKey);
if (resultString == null) {
throw new NumberFormatException("Requested key is null.");
}
result = Long.valueOf(resultString);
} catch (NumberFormatException ex) {
logger.debug("Could not fetch {} result for type: {} and filter: {}. Using default value '0': {}",
requestedKey, entriesType, entriesFilter, ex.getMessage(), ex);