Update util bundle to include some extra packages in order to help dns lib to extend its search for dns servers.

cusax-fix
Damian Minkov 16 years ago
parent a86e3fda2a
commit 8f571ffedc

@ -19,6 +19,7 @@ org.osgi.framework.system.packages.extra= \
sun.awt.shell; \
sun.misc; \
sun.net.util; \
sun.net.dns; \
sun.security.action;
felix.auto.start.10= \

@ -25,6 +25,7 @@ org.osgi.framework.system.packages.extra= \
sun.awt.shell; \
sun.misc; \
sun.net.util; \
sun.net.dns; \
sun.security.action;

@ -2097,16 +2097,25 @@ public void cancelActiveFileTransfers()
while (activeKeys.hasMoreElements())
{
String key = activeKeys.nextElement();
Object descriptor = activeFileTransfers.get(key);
if (descriptor instanceof IncomingFileTransferRequest)
// catchall so if anything happens we still
// will close the chat/window
try
{
((IncomingFileTransferRequest) descriptor).rejectFile();
String key = activeKeys.nextElement();
Object descriptor = activeFileTransfers.get(key);
if (descriptor instanceof IncomingFileTransferRequest)
{
((IncomingFileTransferRequest) descriptor).rejectFile();
}
else if (descriptor instanceof FileTransfer)
{
((FileTransfer) descriptor).cancel();
}
}
else if (descriptor instanceof FileTransfer)
catch(Throwable t)
{
((FileTransfer) descriptor).cancel();
logger.error("Cannot cancel file transfer.", t);
}
}
}

@ -32,7 +32,8 @@ Import-Package: org.xml.sax,
net.java.sip.communicator.service.configuration,
net.java.sip.communicator.service.contactlist,
sun.awt.shell,
sun.net.util
sun.net.util,
sun.net.dns
Export-Package: net.java.sip.communicator.util.xml,
net.java.sip.communicator.util.swing.plaf,
net.java.sip.communicator.util.swing.event,

Loading…
Cancel
Save