Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-04-21 06:19:25 +0000
committerEike Stepper2010-04-21 06:19:25 +0000
commitdc58d1ad5f54ac555e646d6909e9d6aaea643863 (patch)
tree8e1d35eaa8e779dd35f0322aef539822f4bde9bc
parent4d098cec7accfaab90c76fabae4b69a3d6a5da0a (diff)
downloadcdo-dc58d1ad5f54ac555e646d6909e9d6aaea643863.tar.gz
cdo-dc58d1ad5f54ac555e646d6909e9d6aaea643863.tar.xz
cdo-dc58d1ad5f54ac555e646d6909e9d6aaea643863.zip
[256936] Support for Offline Mode
https://bugs.eclipse.org/bugs/show_bug.cgi?id=256936
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java4
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java1
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java8
-rw-r--r--plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/OptionsEvent.java2
4 files changed, 11 insertions, 4 deletions
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
index 0f7830283a..5b0c427433 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/internal/util/om/OSGiPlatform.java
@@ -58,7 +58,7 @@ public class OSGiPlatform extends AbstractPlatform
DebugOptions debugOptions = getDebugOptions();
return debugOptions.getOption(bundleID + "/" + option); //$NON-NLS-1$
}
- catch (Exception ex)
+ catch (RuntimeException ex)
{
return null;
}
@@ -72,7 +72,7 @@ public class OSGiPlatform extends AbstractPlatform
DebugOptions debugOptions = getDebugOptions();
debugOptions.setOption(bundleID + "/" + option, value); //$NON-NLS-1$
}
- catch (Exception ex)
+ catch (RuntimeException ex)
{
}
}
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
index 03aaff7cf9..c7e6751627 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/io/NIOUtil.java
@@ -86,7 +86,6 @@ public final class NIOUtil
@SuppressWarnings("unused")
private static void copy(final File src, File dst, final boolean overwrite) throws IOException
{
- long q = System.currentTimeMillis();
if (!src.isFile() || !src.exists())
{
throw new IllegalArgumentException("Source file '" + src.getAbsolutePath() + "' not found!"); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
index c600176e90..1d3e1faa30 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/om/trace/RemoteTraceServer.java
@@ -61,6 +61,14 @@ public class RemoteTraceServer
this.port = port;
this.address = address;
serverSocket = bind();
+ start();
+ }
+
+ /**
+ * @since 3.0
+ */
+ public void start()
+ {
new Thread("RemoteTraceServer") //$NON-NLS-1$
{
@Override
diff --git a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/OptionsEvent.java b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/OptionsEvent.java
index 640dbfae6f..1b23b015c9 100644
--- a/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/OptionsEvent.java
+++ b/plugins/org.eclipse.net4j.util/src/org/eclipse/net4j/util/options/OptionsEvent.java
@@ -29,6 +29,6 @@ public class OptionsEvent extends Event implements IOptionsEvent
@Override
public IOptions getSource()
{
- return getSource();
+ return (IOptions)super.getSource();
}
}

Back to the top