[libbluray-devel] Fix BD-J build

[hpi1]

libbluray | branch: master | hpi1 <hpi1 at anonymous.org> | Thu Mar 27 16:03:24 2014 +0200| [7a5c80ac469427de923c60703804d16e53e20670] | committer: hpi1

Fix BD-J build

> http://git.videolan.org/gitweb.cgi/libbluray.git/?a=commit;h=7a5c80ac469427de923c60703804d16e53e20670
---

 src/libbluray/bdj/java/org/videolan/BDJActionManager.java |    2 +-
 src/libbluray/bdj/java/org/videolan/BDJXletContext.java   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libbluray/bdj/java/org/videolan/BDJActionManager.java b/src/libbluray/bdj/java/org/videolan/BDJActionManager.java
index fc2d4e7..04b5343 100644
--- a/src/libbluray/bdj/java/org/videolan/BDJActionManager.java
+++ b/src/libbluray/bdj/java/org/videolan/BDJActionManager.java
@@ -19,7 +19,7 @@
 package org.videolan;
 
 public class BDJActionManager {
-    protected static BDJActionManager createInstance() {
+    protected static void createInstance() {
         if (running) {
             System.err.println("BDJActionManager: manager already running! " + Logger.dumpStack());
             return;
diff --git a/src/libbluray/bdj/java/org/videolan/BDJXletContext.java b/src/libbluray/bdj/java/org/videolan/BDJXletContext.java
index e12e350..5ead166 100644
--- a/src/libbluray/bdj/java/org/videolan/BDJXletContext.java
+++ b/src/libbluray/bdj/java/org/videolan/BDJXletContext.java
@@ -230,11 +230,11 @@ public class BDJXletContext implements javax.tv.xlet.XletContext, javax.microedi
     }
 
     public static void stopThread(Thread thread, int timeout, String type) {
-        if (!waitForShutdown(thread, timeout)) {
+        if (!waitThread(thread, timeout)) {
             thread.interrupt();
-            if (!waitForShutdown(thread, 200)) {
+            if (!waitThread(thread, 200)) {
                 PortingHelper.stopThread(thread);
-                logger.error("killing " + type + " thread " + t);
+                logger.error("killing " + type + " thread " + thread);
             }
         }
         try {