Projects >> nuxeo >>44499725045b21620061fd9b30956ba06da86738

Chunk
Conflicting content
	  List providers = sm.getSpacesProviders();
	  for(SpaceProvider provider : providers) {
		  try {
		  throw new SpaceException("Unable to get Space Manager",e);
	  }
    session.save();
  }

<<<<<<< HEAD
public String getProviderName() throws ClientException {
    SpaceManager sm;
    try {
        sm = Framework.getService(SpaceManager.class);
    } catch (Exception e) {
        throw new SpaceException("Unable to get Space Manager",e);
    }
    List providers = sm.getSpacesProviders();
    for(SpaceProvider provider : providers) {
    	try {
			if (provider.getSpace(this.getName(), this.session()) != null) {
				return sm.getProviderName(provider);
			}
		} catch (SpaceNotFoundException e) {
//			LOGGER.warn("space " + getName() + " not found in " + provider);
		}
    }
	return null;
}
=======
  public String getProviderName() throws ClientException {
	  SpaceManager sm;
	  try {
		  sm = Framework.getService(SpaceManager.class);
	  } catch (Exception e) {
			  if (provider.getSpace(this.getName(), this.session()) != null) {
				  return sm.getProviderName(provider);
			  }
		  } catch (SpaceNotFoundException e) {
			  LOGGER.warn("space " + getName() + " not found in " + provider);
		  }
	  }
	  return null;
  }
>>>>>>> d82011f97b98f9bdd3b9e688a2230935901419f9

}
Solution content
    session.save();
  }

  public String getProviderName() throws ClientException {
	  SpaceManager sm;
	  try {
		  sm = Framework.getService(SpaceManager.class);
	  } catch (Exception e) {
		  throw new SpaceException("Unable to get Space Manager",e);
	  }
	  List providers = sm.getSpacesProviders();
	  for(SpaceProvider provider : providers) {
		  try {
			  if (provider.getSpace(this.getName(), this.session()) != null) {
				  return sm.getProviderName(provider);
			  }
		  } catch (SpaceNotFoundException e) {
//			LOGGER.warn("space " + getName() + " not found in " + provider);
		  }
	  }
	  return null;
  }

}
File
DocSpaceImpl.java
Developer's decision
Version 1
Kind of conflict
Method declaration