diff options
author | Jacek Centkowski <geminica.programs@gmail.com> | 2022-05-12 12:59:30 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-05-12 12:59:30 +0000 |
commit | 085e5185c02713039da834ed17516839646c59f3 (patch) | |
tree | d011a32bfd1b9e833f9271e9704fe0e30356cf83 | |
parent | 94d0f99fa2d0373af5083068d49c6f4287135065 (diff) | |
parent | 2fa8a88a478a3f21273ac93a90903306b87d6051 (diff) |
Merge "Fix loading of soy template resource upon cache refresh" into stable-3.6
-rw-r--r-- | java/com/google/gerrit/server/mail/send/MailSoySauceLoader.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/java/com/google/gerrit/server/mail/send/MailSoySauceLoader.java b/java/com/google/gerrit/server/mail/send/MailSoySauceLoader.java index ad1703d8ae..8ee8fc2a46 100644 --- a/java/com/google/gerrit/server/mail/send/MailSoySauceLoader.java +++ b/java/com/google/gerrit/server/mail/send/MailSoySauceLoader.java @@ -14,8 +14,9 @@ package com.google.gerrit.server.mail.send; +import static com.google.common.base.Preconditions.checkArgument; + import com.google.common.io.CharStreams; -import com.google.common.io.Resources; import com.google.gerrit.server.config.SitePaths; import com.google.gerrit.server.plugincontext.PluginSetContext; import com.google.inject.Inject; @@ -26,6 +27,7 @@ import com.google.template.soy.jbcsrc.api.SoySauce; import com.google.template.soy.shared.SoyAstCache; import java.io.IOException; import java.io.Reader; +import java.net.URL; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; @@ -137,6 +139,8 @@ class MailSoySauceLoader { } // Otherwise load the template as a resource. - builder.add(Resources.getResource(logicalPath), logicalPath); + URL resource = this.getClass().getClassLoader().getResource(logicalPath); + checkArgument(resource != null, "resource %s not found.", logicalPath); + builder.add(resource, logicalPath); } } |