commit 5e3b996bdda00d21742617ed1a99ac7c675c0c4e
author David Pursehouse <david.pursehouse@sonymobile.com> Thu Mar 10 08:29:54 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 10 08:29:55 2016 +0000
tree 373c615fcf690ff55c64ec6cca163486ac00a0de
parent 5f3e73bc8c8ac7df60d28941e2217289248dc7e2
parent 2809c48552f8a9893299e263497931f0bfde8cf3

Merge "Added not null check when collecting RefsSoyData"

gitiles-servlet/src/main/java/com/google/gitiles/DefaultAccess.java

diff --git a/gitiles-servlet/src/main/java/com/google/gitiles/DefaultAccess.java b/gitiles-servlet/src/main/java/com/google/gitiles/DefaultAccess.java
index 5fda0df..6fc3211 100644
--- a/gitiles-servlet/src/main/java/com/google/gitiles/DefaultAccess.java
+++ b/gitiles-servlet/src/main/java/com/google/gitiles/DefaultAccess.java
@@ -185,7 +185,7 @@
       File descFile = new File(repo.getDirectory(), "description");
       if (descFile.exists()) {
         desc = new String(IO.readFully(descFile));
-        if (DEFAULT_DESCRIPTION.equals(CharMatcher.WHITESPACE.trimFrom(desc))) {
+        if (DEFAULT_DESCRIPTION.equals(CharMatcher.whitespace().trimFrom(desc))) {
           desc = null;
         }
       } else if (configError != null) {

lib/BUCK

diff --git a/lib/BUCK b/lib/BUCK
index a14b356..2e4205f 100644
--- a/lib/BUCK
+++ b/lib/BUCK
@@ -12,8 +12,8 @@
 
 maven_jar(
   name = 'guava',
-  id = 'com.google.guava:guava:18.0',
-  sha1 = 'cce0823396aa693798f8882e64213b1772032b09',
+  id = 'com.google.guava:guava:19.0',
+  sha1 = '6ce200f6b23222af3d8abb6b6459e6c44f4bb0e9',
 )
 
 maven_jar(