| OLD | NEW |
| 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 part of vmservice_io; | 5 part of vmservice_io; |
| 6 | 6 |
| 7 _sanitizeWindowsPath(path) { | 7 _sanitizeWindowsPath(path) { |
| 8 // For Windows we need to massage the paths a bit according to | 8 // For Windows we need to massage the paths a bit according to |
| 9 // http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx | 9 // http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx |
| 10 // | 10 // |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 if (packageRootFlag != null) { | 86 if (packageRootFlag != null) { |
| 87 _setPackageRoot(packageRootFlag); | 87 _setPackageRoot(packageRootFlag); |
| 88 } | 88 } |
| 89 // If the --packages flag was passed. | 89 // If the --packages flag was passed. |
| 90 if (packagesConfigFlag != null) { | 90 if (packagesConfigFlag != null) { |
| 91 _setPackagesConfig(packagesConfigFlag); | 91 _setPackagesConfig(packagesConfigFlag); |
| 92 } | 92 } |
| 93 } | 93 } |
| 94 | 94 |
| 95 void updatePackageMap(String packagesConfigFlag) { | 95 void updatePackageMap(String packagesConfigFlag) { |
| 96 if (packagesConfigFlag == null) { |
| 97 return; |
| 98 } |
| 96 _packageMap = null; | 99 _packageMap = null; |
| 97 _setPackagesConfig(packagesConfigFlag); | 100 _setPackagesConfig(packagesConfigFlag); |
| 98 } | 101 } |
| 99 | 102 |
| 100 void cleanup() { | 103 void cleanup() { |
| 101 _dead = true; | 104 _dead = true; |
| 102 if (_packagesPort != null) { | 105 if (_packagesPort != null) { |
| 103 _packagesPort.close(); | 106 _packagesPort.close(); |
| 104 _packagesPort = null; | 107 _packagesPort = null; |
| 105 } | 108 } |
| (...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1154 msg[2] = resolvedUri.toString(); | 1157 msg[2] = resolvedUri.toString(); |
| 1155 msg[3] = null; | 1158 msg[3] = null; |
| 1156 msg[4] = e.toString(); | 1159 msg[4] = e.toString(); |
| 1157 sp.send(msg); | 1160 sp.send(msg); |
| 1158 } | 1161 } |
| 1159 break; | 1162 break; |
| 1160 default: | 1163 default: |
| 1161 _log('Unknown loader request tag=$tag from $isolateId'); | 1164 _log('Unknown loader request tag=$tag from $isolateId'); |
| 1162 } | 1165 } |
| 1163 } | 1166 } |
| OLD | NEW |