From b50956f57915b5f08f863ec8080c51063304178b Mon Sep 17 00:00:00 2001 From: Zach Garner Date: Fri, 9 May 2014 13:35:36 -0500 Subject: [PATCH] Fix issue with defaultModel singleton management Model.defaultModel is a singleton but is never assigned a value, causing the multiple calls to the method Model.defaultModel() to go through the time consuming task of recreating it each time. --- .../src/main/java/com/carrotsearch/labs/langid/Model.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/langid-java/src/main/java/com/carrotsearch/labs/langid/Model.java b/langid-java/src/main/java/com/carrotsearch/labs/langid/Model.java index c91e25e..8b6c939 100644 --- a/langid-java/src/main/java/com/carrotsearch/labs/langid/Model.java +++ b/langid-java/src/main/java/com/carrotsearch/labs/langid/Model.java @@ -175,10 +175,12 @@ public static synchronized Model defaultModel() { os.flush(); - return Model.readExternal( + defaultModel = Model.readExternal( new ObjectInputStream( new ByteArrayInputStream( os.toByteArray()))); + return defaultModel; + } catch (Exception e) { throw new RuntimeException("Default model not available.", e); } finally {