mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-19 06:55:23 +02:00
Code Issues Wiki Activity

[367264] [dstore] Trace should be written when load miner is failed.

Browse source
This commit is contained in:
David McKnight 2011-12-22 14:22:33 +00:00
parent a090799028
commit 015fe4c937
2 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/core/java/RemoteClassLoader.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2009 IBM Corporation and others. * Copyright (c) 2006, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -14,6 +14,7 @@
* Contributors: * Contributors:
* David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed * David McKnight (IBM) - [226561] [apidoc] Add API markup to RSE Javadocs where extend / implement is allowed
* David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed * David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed
* David McKnight (IBM) - [367264] [dstore] Trace should be written when load miner is failed.
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.core.java; package org.eclipse.dstore.core.java;
@ -131,7 +132,11 @@ public class RemoteClassLoader extends ClassLoader
public boolean useCaching() public boolean useCaching()
{ {
boolean useCaching = false; boolean useCaching = false;
String pref = _dataStore.getPreference(CACHING_PREFERENCE);
// hard coding this to false for now since remote loading can cause problems
// and isn't intentionally used by anyone
String pref = "false"; //$NON-NLS-1$
//String pref = _dataStore.getPreference(CACHING_PREFERENCE);
if (pref != null && pref.equals("true")) //$NON-NLS-1$ if (pref != null && pref.equals("true")) //$NON-NLS-1$
{ {
useCaching = true; useCaching = true;
@ -185,9 +190,8 @@ public class RemoteClassLoader extends ClassLoader
theClass = ((ClassLoader)localLoaders.get(i)).loadClass(className); theClass = ((ClassLoader)localLoaders.get(i)).loadClass(className);
if (theClass != null) return theClass; if (theClass != null) return theClass;
} }
catch (Exception e) catch (Exception e){
{ _dataStore.trace(e);
//e.printStackTrace();
} }
} }
} }
@ -203,9 +207,14 @@ public class RemoteClassLoader extends ClassLoader
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); if (!_useCaching){
// no remote loading in this case
throw new ClassNotFoundException(className);
}
} }
// DKM // DKM
// only do lookup if the classname looks valid // only do lookup if the classname looks valid
// don't want to be requesting rsecomm from client // don't want to be requesting rsecomm from client

15
rse/plugins/org.eclipse.dstore.core/src/org/eclipse/dstore/internal/core/server/MinerLoader.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2002, 2009 IBM Corporation and others. * Copyright (c) 2002, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -13,6 +13,7 @@
* *
* Contributors: * Contributors:
* David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed * David McKnight (IBM) - [244388] [dstore] Connection hangs when a miner not installed
* David McKnight (IBM) - [367264] [dstore] Trace should be written when load miner is failed.
*******************************************************************************/ *******************************************************************************/
package org.eclipse.dstore.internal.core.server; package org.eclipse.dstore.internal.core.server;
@ -213,25 +214,25 @@ public class MinerLoader implements ISchemaRegistry
} }
catch (NoClassDefFoundError e) catch (NoClassDefFoundError e)
{ {
e.printStackTrace(); _dataStore.trace(e);
handleNoClassFound(e.getMessage().replace('/','.')); handleNoClassFound(e.getMessage().replace('/','.'));
} }
catch (ClassNotFoundException e) catch (ClassNotFoundException e)
{ {
e.printStackTrace(); _dataStore.trace(e);
handleNoClassFound(name); handleNoClassFound(name);
} }
catch (InstantiationException e) catch (InstantiationException e)
{ {
e.printStackTrace(); _dataStore.trace(e);
} }
catch (IllegalAccessException e) catch (IllegalAccessException e)
{ {
e.printStackTrace(); _dataStore.trace(e);
} }
catch (Exception e) catch (Exception e)
{ {
e.printStackTrace(); _dataStore.trace(e);
} }
} }
else else
@ -350,7 +351,6 @@ public class MinerLoader implements ISchemaRegistry
//if (remoteLoader.canLoad(source)) //if (remoteLoader.canLoad(source))
if(true) if(true)
{ {
//System.out.println("using RemoteClassLoader");
return remoteLoader; return remoteLoader;
} }
@ -359,7 +359,6 @@ public class MinerLoader implements ISchemaRegistry
ExternalLoader loader = (ExternalLoader) _loaders.get(i); ExternalLoader loader = (ExternalLoader) _loaders.get(i);
if (loader.canLoad(source)) if (loader.canLoad(source))
{ {
// System.out.println("using local loader");
return loader; return loader;
} }
else else