Author: mcombellack
Date: Thu May 15 05:46:25 2008
New Revision: 656635
URL: http://svn.apache.org/viewvc?rev=656635&view=rev
Log:
Corrected order of modifiers to be consistent with the recommendations from the
Java Language Specification
Modified:
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
Modified:
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java?rev=656635&r1=656634&r2=656635&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
(original)
+++
incubator/tuscany/java/sca/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/OSGiRuntime.java
Thu May 15 05:46:25 2008
@@ -62,7 +62,7 @@
*
* @throws BundleException
*/
- public synchronized static OSGiRuntime findRuntime() throws Exception {
+ public static synchronized OSGiRuntime findRuntime() throws Exception {
if (instance != null) {
@@ -120,11 +120,11 @@
}
- public synchronized static OSGiRuntime getRuntime() throws Exception {
+ public static synchronized OSGiRuntime getRuntime() throws Exception {
return getRuntime(false);
}
- public synchronized static OSGiRuntime getRuntime(boolean
tuscanyRunningInOSGiContainer) throws Exception {
+ public static synchronized OSGiRuntime getRuntime(boolean
tuscanyRunningInOSGiContainer) throws Exception {
instance = findRuntime();
@@ -192,7 +192,7 @@
return null;
}
- public synchronized static Bundle findInstalledBundle(String
bundleLocation) {
+ public static synchronized Bundle findInstalledBundle(String
bundleLocation) {
if (instance != null) {
if
(bundleLocation.startsWith("bundle:")||bundleLocation.startsWith("bundleresource:"))
{
try {
@@ -207,7 +207,7 @@
return null;
}
- public synchronized static Bundle findInstalledBundle(URL bundleURL) {
+ public static synchronized Bundle findInstalledBundle(URL bundleURL) {
if (instance != null) {
if (instance.bundleContext != null) {
Bundle[] installedBundles =
instance.bundleContext.getBundles();
@@ -261,9 +261,11 @@
}
/**
- * @return the instance
+ * Stops the OSGi instance.
+ *
+ * @throws Exception Failed to shutdown the OSGi instance.
*/
- public synchronized static void stop() throws Exception {
+ public static synchronized void stop() throws Exception {
if (instance != null && !instance.tuscanyRunningInOSGiContainer) {
instance.shutdown();
instance = null;