Revision 34129

View differences:

branches/v2_0_0_prep/libraries/libFMap_daldb/src/org/gvsig/fmap/dal/store/jdbc/JDBCServerExplorer.java
265 265 
					+ parameters.getDBName() + " other:" + pgp.getDBName()
266 266 
					+ ")");
267 267 
		}
268 
		if (parameters.getCatalog() != null) {
268 
		if (parameters.getCatalog() != null && !parameters.getCatalog().trim().equals("")) {
269 269 
			// implicit catalog
270 270 
			if (!compare(pgp.getCatalog(), parameters.getCatalog())) {
271 271 
				// FIXME Exception ???
......
275 275 
								+ pgp.getCatalog() + ")");
276 276 
			}
277 277 
		}
278 
		if (parameters.getSchema() != null) {
278 
		if (parameters.getSchema() != null && !parameters.getSchema().trim().equals("")) {
279 279 
			// implicit schema
280 280 
			if (!compare(pgp.getSchema(), parameters.getSchema())) {
281 281 
				// FIXME Exception ???
......
314 314 
		orgParams.setDBName(parameters.getDBName());
315 315 
		orgParams.setUser(parameters.getUser());
316 316 
		orgParams.setPassword(parameters.getPassword());
317 
        orgParams.setCatalog(parameters.getCatalog());
317 318 
		return orgParams;
318 319 
	}
319 320 

  		












Also available in:  Unified diff