From d9e961d4d3c0f64784fb0ca285f8388ae8535010 Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Wed, 11 Feb 2009 11:18:58 +0000
Subject: Merge branch 'QPID-1583'

Conflicts:
	qpid/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@743304 13f79535-47bb-0310-9956-ffa450edef68
---
 java/common/src/main/java/org/apache/qpid/util/NetMatcher.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'java/common')

diff --git a/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java b/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
index 4ffc32c218..4c653e6ca0 100644
--- a/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
+++ b/java/common/src/main/java/org/apache/qpid/util/NetMatcher.java
@@ -18,9 +18,8 @@
 package org.apache.qpid.util;
 
 import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collection;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 
 public class NetMatcher
-- 
cgit v1.2.1