Skip to content

Fixed issues with loading #Build static initializer in OSGi container. #21955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fixed issues with loading #Build static initializer in OSGi container. #21955

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd9e0d6
fixed issues with loading #Build static initializer in OSGi or protec…
trajar Dec 3, 2016
5a5e4f0
Merge branch 'master' into master
trajar Mar 1, 2017
03e60fe
Merge remote-tracking branch 'elastic/master'
trajar Mar 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions core/src/main/java/org/elasticsearch/Build.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,25 +39,20 @@ public class Build {
public static final Build CURRENT;

static {
final String shortHash;
final String date;
final boolean isSnapshot;
String shortHash = "Unknown";
String date = "Unknown";
boolean isSnapshot = true;

final URL url = getElasticsearchCodebase();
if (url.toString().endsWith(".jar")) {
if (url != null && url.toString().endsWith(".jar")) {
try (JarInputStream jar = new JarInputStream(FileSystemUtils.openFileURLStream(url))) {
Manifest manifest = jar.getManifest();
shortHash = manifest.getMainAttributes().getValue("Change");
date = manifest.getMainAttributes().getValue("Build-Date");
isSnapshot = "true".equals(manifest.getMainAttributes().getValue("X-Compile-Elasticsearch-Snapshot"));
} catch (IOException e) {
throw new RuntimeException(e);
// unable to open jar, possibly running in OSGi or embedded runtime container
}
} else {
// not running from a jar (unit tests, IDE)
shortHash = "Unknown";
date = "Unknown";
isSnapshot = true;
}
if (shortHash == null) {
throw new IllegalStateException("Error finding the build shortHash. " +
Expand Down