Version 1.5.7

dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/pubserve/PubServeResourceResolver.java

 /*
  * Copyright (c) 2014, the Dart project authors.
  * 
  * Licensed under the Eclipse Public License v1.0 (the "License"); you may not use this file except
  * in compliance with the License. You may obtain a copy of the License at
  * 
  * http://www.eclipse.org/legal/epl-v10.html
  * 
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
@@ skipping 86 matching lines @@
   }
 
   @Override
   public String getUrlForResource(IResource resource) {
 
     String url = resourceToUrl.get(resource.getFullPath().toString());
     if (url != null) {
       return url;
     }
 
-    CountDownLatch latch = new CountDownLatch(1);
     final String[] done = new String[1];
 
-    try {
-      PubServeManager.getManager().sendGetUrlCommand(resource, new UrlForFileCallback(latch, done));
-    } catch (IOException e) {
-      DartCore.logError(e);
-      return done[0];
-    }
-    try {
-      latch.await(5000, TimeUnit.MILLISECONDS);
-    } catch (InterruptedException e) {
-      // do nothing
-    }
-    if (done[0] != null) {
-      resourceToUrl.put(resource.getFullPath().toString(), done[0]);
+    if (PubServeManager.getManager().isServing()) {
+      CountDownLatch latch = new CountDownLatch(1);
+      try {
+        PubServeManager.getManager().sendGetUrlCommand(
+            resource,
+            new UrlForFileCallback(latch, done));
+      } catch (IOException e) {
+        DartCore.logError(e);
+        return done[0];
+      }
+      try {
+        latch.await(3000, TimeUnit.MILLISECONDS);
+      } catch (InterruptedException e) {
+        // do nothing
+      }
+      if (done[0] != null) {
+        resourceToUrl.put(resource.getFullPath().toString(), done[0]);
+      }
     }
     return done[0];
   }
 
   @Override
   public String getUrlRegexForResource(IResource resource) {
     IContainer appDir = DartCore.getApplicationDirectory(resource);
     // remove till application directory
     // L/sample/web/sample.dart => web/sample.dart
 
@@ skipping 18 matching lines @@
   }
 
   @Override
   public IResource resolveUrl(String url) {
 
     String assetId = urlToAsset.get(url);
     if (assetId != null) {
       return getResourceForPath(assetId);
     }
 
-    CountDownLatch latch = new CountDownLatch(1);
-    final String[] name = new String[1];
-    final String[] path = new String[1];
+    if (PubServeManager.getManager().isServing()) {
 
-    try {
-      PubServeManager.getManager().sendGetAssetIdCommand(
-          url,
-          new FilePathForUrlCallback(latch, name, path));
-    } catch (IOException e) {
-      DartCore.logError(e);
-      return null;
-    }
-    try {
-      latch.await(5000, TimeUnit.MILLISECONDS);
-    } catch (InterruptedException e) {
-      // do nothing
-    }
-    if (path[0] != null) {
-      urlToAsset.put(url, path[0]);
-      return getResourceForPath(path[0]);
+      CountDownLatch latch = new CountDownLatch(1);
+      final String[] name = new String[1];
+      final String[] path = new String[1];
+
+      try {
+        PubServeManager.getManager().sendGetAssetIdCommand(
+            url,
+            new FilePathForUrlCallback(latch, name, path));
+      } catch (IOException e) {
+        DartCore.logError(e);
+        return null;
+      }
+      try {
+        latch.await(3000, TimeUnit.MILLISECONDS);
+      } catch (InterruptedException e) {
+        // do nothing
+      }
+      if (path[0] != null) {
+        urlToAsset.put(url, path[0]);
+        return getResourceForPath(path[0]);
+      }
     }
     return null;
   }
 
   private IResource getResourceForPath(final String path) {
     IContainer appDir = PubServeManager.getManager().getCurrentServeWorkingDir();
     // TODO(keertip): check if appdir has pubfolder with same pubspec name
     IResource resource = appDir.findMember(path);
     return resource;
   }
 
 }