aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2011-10-14 12:58:03 +0200
committerSamuel Tardieu <sam@rfc1149.net>2011-10-14 12:58:03 +0200
commit3688fed754ac08d016628ad01b777a5fc920f8a6 (patch)
tree0b05d16e11259c924323ff45b4ded4312cadaf18
parentc5d43adaa9db1db877ea084551db74faa048a7e1 (diff)
downloadcgeo-3688fed754ac08d016628ad01b777a5fc920f8a6.zip
cgeo-3688fed754ac08d016628ad01b777a5fc920f8a6.tar.gz
cgeo-3688fed754ac08d016628ad01b777a5fc920f8a6.tar.bz2
Do not trim what may be a null string without using StringUtils
This closes #662.
-rw-r--r--main/src/cgeo/geocaching/cgBase.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/cgBase.java b/main/src/cgeo/geocaching/cgBase.java
index 7ae0931..fa984df 100644
--- a/main/src/cgeo/geocaching/cgBase.java
+++ b/main/src/cgeo/geocaching/cgBase.java
@@ -1902,13 +1902,13 @@ public class cgBase {
try {
final Matcher matcherDetailsImage = PATTERN_TRACKABLE_DETAILSIMAGE.matcher(page);
if (matcherDetailsImage.find() && matcherDetailsImage.groupCount() > 0) {
- final String image = matcherDetailsImage.group(3).trim();
- final String details = matcherDetailsImage.group(4).trim();
+ final String image = StringUtils.trim(matcherDetailsImage.group(3));
+ final String details = StringUtils.trim(matcherDetailsImage.group(4));
- if (image != null) {
+ if (StringUtils.isNotEmpty(image)) {
trackable.setImage(image);
}
- if (details != null && !details.equals("No additional details available.")) {
+ if (StringUtils.isNotEmpty(details) && !StringUtils.equals(details, "No additional details available.")) {
trackable.setDetails(details);
}
}