apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added '/' to gitignore

Browse Source
This commit is contained in:
Alex Huang 2010-08-19 09:04:10 -07:00
parent ff02e07a33
commit 52e6f3a85b
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitignore vendored
View File

@ -1,14 +1,15 @@
build/build.number build/build.number
bin/ bin/
cloudstack-proprietary cloudstack-proprietary/
premium/
.lock-wscript .lock-wscript
artifacts artifacts/
.waf-* .waf-*
waf-* waf-*
target target/
override/ override/
.metadata .metadata
dist dist/
*~ *~
*.bak *.bak
cloud-*.tar.bz2 cloud-*.tar.bz2

4
core/src/com/cloud/hypervisor/xen/resource/XenServerConnectionPool.java
View File

@ -269,7 +269,7 @@ public class XenServerConnectionPool {
try { try {
slaveConn = new Connection(new URL("http://" + slaveAddress), wait); slaveConn = new Connection(new URL("http://" + slaveAddress), wait);
if (slaveConn != null) { if (slaveConn != null) {
Session slaveSession = Session.slaveLocalLoginWithPassword(slaveConn, username, password); Session.slaveLocalLoginWithPassword(slaveConn, username, password);
Pool.Record slavePoolr = getPoolRecord(slaveConn); Pool.Record slavePoolr = getPoolRecord(slaveConn);
String possibleMaster = slavePoolr.master.getAddress(slaveConn); String possibleMaster = slavePoolr.master.getAddress(slaveConn);
Integer c = count.get(possibleMaster); Integer c = count.get(possibleMaster);
@ -280,7 +280,7 @@ public class XenServerConnectionPool {
} }
count.put(possibleMaster, c); count.put(possibleMaster, c);
try { try {
slaveSession.logout(slaveConn); Session.logout(slaveConn);
} catch (Exception e) { } catch (Exception e) {
s_logger.debug("client session logout: " + e.getMessage()); s_logger.debug("client session logout: " + e.getMessage());
} }