Merge remote-tracking branch 'origin/master'

This commit is contained in:
Yann Cébron
2013-05-29 15:45:19 +02:00
2 changed files with 3 additions and 2 deletions
-1
View File
@@ -19,7 +19,6 @@
<orderEntry type="module" module-name="relaxng" scope="RUNTIME" />
<orderEntry type="module" module-name="spellchecker" scope="RUNTIME" />
<orderEntry type="module" module-name="xdebugger-impl" scope="RUNTIME" />
<orderEntry type="module" module-name="resources" scope="TEST" />
</component>
</module>
@@ -57,7 +57,9 @@ public class ProductivityFeaturesRegistryImpl extends ProductivityFeaturesRegist
readFromXml("file:///ProductivityFeaturesRegistry.xml");
}
catch (Exception e) {
LOG.error(e);
if (!ApplicationManager.getApplication().isUnitTestMode()) {
LOG.error(e);
}
}
try {