< prev index next >

src/jdk.jpackage/share/native/libapplauncher/main.cpp

Print this page

        

@@ -27,20 +27,13 @@
 #include "PlatformString.h"
 #include "FilePath.h"
 #include "PropertyFile.h"
 #include "JavaVirtualMachine.h"
 #include "Package.h"
-#include "PlatformThread.h"
 #include "Macros.h"
 #include "Messages.h"
 
-
-#ifdef WINDOWS
-#include <Shellapi.h>
-#endif
-
-
 #include <stdio.h>
 #include <signal.h>
 #include <stdlib.h>
 
 /*

@@ -66,17 +59,10 @@
     See CR 6316197 for more information.
 */
 
 extern "C" {
 
-#ifdef WINDOWS
-    BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,
-            LPVOID lpvReserved) {
-        return true;
-    }
-#endif //WINDOWS
-
     JNIEXPORT bool start_launcher(int argc, TCHAR* argv[]) {
         bool result = false;
         bool parentProcess = true;
 
         // Platform must be initialize first.

@@ -181,11 +167,11 @@
                         Messages& messages = Messages::GetInstance();
                         TString message = PlatformString::Format(
                                 messages.GetMessage(
                                 APPCDS_CACHE_FILE_NOT_FOUND),
                                 cacheFileName.data());
-                        throw FileNotFoundException(message);
+                        throw Exception(message);
                     }
                     break;
                 }
 
                 case cdsUninitialized: {

@@ -194,11 +180,11 @@
                 }
             }
 
             // Run App
             result = RunVM();
-        } catch (FileNotFoundException &e) {
+        } catch (Exception &e) {
             platform.ShowMessage(e.GetMessage());
         }
 
         return result;
     }
< prev index next >