Skip to content

Commit 6f66c4c

Browse files
author
bwelling
committed
call Name.fromString, not Name(String)
git-svn-id: http://svn.code.sf.net/p/dnsjava/code/trunk@694 c76caeb1-94fd-44dd-870f-0c9d92034fc1
1 parent 8afb683 commit 6f66c4c

14 files changed

Lines changed: 47 additions & 30 deletions

‎dig.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,13 @@ public class dig {
7777

7878
String nameString = argv[arg++];
7979
if (nameString.equals("-x")) {
80-
name = new Name(dns.inaddrString(argv[arg++]));
80+
name = Name.fromString(dns.inaddrString(argv[arg++]),
81+
Name.root);
8182
type = Type.PTR;
8283
_class = DClass.IN;
8384
}
8485
else {
85-
name = new Name(nameString);
86+
name = Name.fromString(nameString, Name.root);
8687
type = Type.value(argv[arg]);
8788
if (type < 0)
8889
type = Type.A;

‎jnamed.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ else if (keyword.equals("address")) {
9999
Name origin = null;
100100
Cache cache = getCache(DClass.IN);
101101
if (zname != null)
102-
origin = new Name(zname, Name.root);
102+
origin = Name.fromString(zname, Name.root);
103103
Zone newzone = new Zone(zonefile, cache, origin);
104104
znames.put(newzone.getOrigin(), newzone);
105105
/*System.out.println("Adding zone named <" + newzone.getOrigin() + ">");*/
@@ -108,15 +108,16 @@ else if (keyword.equals("address")) {
108108
public void
109109
addSecondaryZone(String zone, String remote) throws IOException {
110110
Cache cache = getCache(DClass.IN);
111-
Name zname = new Name(zone);
111+
Name zname = Name.fromString(zone, Name.root);
112112
Zone newzone = new Zone(zname, DClass.IN, remote, cache);
113113
znames.put(zname, newzone);
114114
/*System.out.println("Adding zone named <" + zname + ">");*/
115115
}
116116

117117
public void
118-
addTSIG(String name, String key) {
119-
TSIGs.put(new Name(name), base64.fromString(key));
118+
addTSIG(String namestr, String key) throws IOException {
119+
Name name = Name.fromString(namestr, Name.root);
120+
TSIGs.put(name, base64.fromString(key));
120121
}
121122

122123
public Cache

‎org/xbill/DNS/A6Record.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class A6Record extends Record {
6666
prefixBits = Short.parseShort(st.nextToken());
6767
suffix = new Inet6Address(st.nextToken());
6868
if (prefixBits > 0)
69-
prefix = new Name(st.nextToken(), origin);
69+
prefix = Name.fromString(st.nextToken(), origin);
7070
}
7171

7272
/** Converts rdata to a String */

‎org/xbill/DNS/MX_KXRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public class MX_KXRecord extends Record {
4949
{
5050
super(_name, _type, _dclass, _ttl);
5151
priority = Short.parseShort(st.nextToken());
52-
target = new Name(st.nextToken(), origin);
52+
target = Name.fromString(st.nextToken(), origin);
5353
}
5454

5555
/** Converts rdata to a String */

‎org/xbill/DNS/Master.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ else if (s.charAt(0) == '$')
112112
parseOrigin(MyStringTokenizer st) throws IOException {
113113
if (!st.hasMoreTokens())
114114
throw new IOException ("Missing ORIGIN");
115-
return new Name(st.nextToken());
115+
return Name.fromString(st.nextToken(), Name.root);
116116
}
117117

118118
private int
@@ -133,7 +133,9 @@ else if (s.charAt(0) == '$')
133133
else
134134
newfile = new File(file.getParent(), filename);
135135
if (st.hasMoreTokens())
136-
included = new Master(newfile, new Name(st.nextToken()));
136+
included = new Master(newfile,
137+
Name.fromString(st.nextToken(),
138+
Name.root));
137139
else
138140
included = new Master(newfile, origin);
139141
}
@@ -147,7 +149,7 @@ else if (s.charAt(0) == '$')
147149
short type, dclass;
148150

149151
if (!useLast)
150-
name = new Name(st.nextToken(), origin);
152+
name = Name.fromString(st.nextToken(), origin);
151153
else
152154
name = last.getName();
153155

‎org/xbill/DNS/NAPTRRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ private NAPTRRecord() {}
7373
flags = st.nextToken();
7474
service = st.nextToken();
7575
regexp = st.nextToken();
76-
replacement = new Name(st.nextToken(), origin);
76+
replacement = Name.fromString(st.nextToken(), origin);
7777
if (Options.check("verbose"))
7878
System.err.println(" NAPTR MyStringTokenizer Constructor: " +
7979
this.toString());

‎org/xbill/DNS/NS_CNAME_PTRRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class NS_CNAME_PTRRecord extends Record {
4545
throws IOException
4646
{
4747
super(_name, _type, _dclass, _ttl);
48-
target = new Name(st.nextToken(), origin);
48+
target = Name.fromString(st.nextToken(), origin);
4949
}
5050

5151
/** Converts the NS, CNAME, or PTR Record to a String */

‎org/xbill/DNS/NXTRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public class NXTRecord extends Record {
6161
{
6262
super(_name, Type.NXT, _dclass, _ttl);
6363
Vector types = new Vector();
64-
next = new Name(st.nextToken(), origin);
64+
next = Name.fromString(st.nextToken(), origin);
6565
bitmap = new BitSet();
6666
while (st.hasMoreTokens()) {
6767
short t = Type.value(st.nextToken());

‎org/xbill/DNS/RPRecord.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public class RPRecord extends Record {
5151
throws IOException
5252
{
5353
super(_name, Type.RP, _dclass, _ttl);
54-
mailbox = new Name(st.nextToken(), origin);
55-
textDomain = new Name(st.nextToken(), origin);
54+
mailbox = Name.fromString(st.nextToken(), origin);
55+
textDomain = Name.fromString(st.nextToken(), origin);
5656
}
5757

5858
/** Converts the RP Record to a String */

‎org/xbill/DNS/SIGRecord.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public class SIGRecord extends Record {
9696
expire = parseDate(st.nextToken());
9797
timeSigned = parseDate(st.nextToken());
9898
footprint = (short) Integer.parseInt(st.nextToken());
99-
signer = new Name(st.nextToken(), origin);
99+
signer = Name.fromString(st.nextToken(), origin);
100100
if (st.hasMoreTokens())
101101
signature = base64.fromString(st.remainingTokens());
102102
}

0 commit comments

Comments
 (0)