Skip to content

Commit

Permalink
Corrections from review.
Browse files Browse the repository at this point in the history
  • Loading branch information
Thrameos committed Jul 25, 2020
1 parent 19ee316 commit 981108c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion jpype/_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ def startJVM(*args, **kwargs):

def initializeResources():
global _JVM_started
_JVM_started = True
_jpype._java_lang_Class = None
_jpype._java_lang_Object = _jpype.JClass("java.lang.Object")
_jpype._java_lang_Throwable = _jpype.JClass("java.lang.Throwable")
Expand Down Expand Up @@ -303,6 +302,9 @@ def initializeResources():
_jpype.JClass('org.jpype.JPypeKeywords').setKeywords(
list(_pykeywords._KEYWORDS))

# Everything successed so started is now true.
_JVM_started = True


def shutdownJVM():
""" Shuts down the JVM.
Expand Down
2 changes: 1 addition & 1 deletion native/common/include/jp_context.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ class JPContext
private:
bool m_Running;
bool m_ConvertStrings;
bool m_Embedded;
bool m_Embedded;
public:
JPGarbageCollection *m_GC;
} ;
Expand Down

0 comments on commit 981108c

Please sign in to comment.