jdk/src/share/classes/com/sun/jndi/ldap/ClientId.java
author prappo
Fri, 01 Aug 2014 22:32:51 +0100
changeset 25808 e113d0a0fde0
parent 25514 3cc6665bb6f4
permissions -rw-r--r--
8054158: Fix typos in JNDI-related packages Reviewed-by: rriggs, vinnie
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
25514
3cc6665bb6f4 8048175: Remove redundant use of reflection on core classes from JNDI
prappo
parents: 24969
diff changeset
     2
 * Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     4
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
90ce3da70b43 Initial load
duke
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    20
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    23
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
90ce3da70b43 Initial load
duke
parents:
diff changeset
    26
package com.sun.jndi.ldap;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10324
diff changeset
    28
import java.util.Locale;
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    29
import java.util.Arrays; // JDK 1.2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    30
import java.io.OutputStream;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    31
import javax.naming.ldap.Control;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    32
import java.lang.reflect.Method;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    33
import javax.net.SocketFactory;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    34
90ce3da70b43 Initial load
duke
parents:
diff changeset
    35
/**
90ce3da70b43 Initial load
duke
parents:
diff changeset
    36
 * Represents identity information about an anonymous LDAP connection.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    37
 * This base class contains the following information:
90ce3da70b43 Initial load
duke
parents:
diff changeset
    38
 * - protocol version number
90ce3da70b43 Initial load
duke
parents:
diff changeset
    39
 * - server's hostname (case-insensitive)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    40
 * - server's port number
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
 * - prototype type (plain or ssl)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    42
 * - controls to be sent with the LDAP bind request
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
 * All other identity classes must be a subclass of ClientId.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
 * Identity subclasses would add more distinguishing information, depending
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
 * on the type of authentication that the connection is to have.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
 * The equals() and hashCode() methods of this class and its subclasses are
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
 * important because they are used to determine whether two requests for
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
 * the same connection are identical, and thus whether the same connection
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
 * may be shared. This is especially important for authenticated connections
90ce3da70b43 Initial load
duke
parents:
diff changeset
    52
 * because a mistake would result in a serious security violation.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    54
 * @author Rosanna Lee
90ce3da70b43 Initial load
duke
parents:
diff changeset
    55
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    56
class ClientId {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    57
    final private int version;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    58
    final private String hostname;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    59
    final private int port;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
    final private String protocol;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
    final private Control[] bindCtls;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    62
    final private OutputStream trace;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    63
    final private String socketFactory;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
    final private int myHash;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    65
    final private int ctlHash;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    66
90ce3da70b43 Initial load
duke
parents:
diff changeset
    67
    private SocketFactory factory = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    68
    private Method sockComparator = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
    private boolean isDefaultSockFactory = false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
    final public static boolean debug = false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
    ClientId(int version, String hostname, int port, String protocol,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
            Control[] bindCtls, OutputStream trace, String socketFactory) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
        this.version = version;
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10324
diff changeset
    75
        this.hostname = hostname.toLowerCase(Locale.ENGLISH);  // ignore case
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
        this.port = port;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    77
        this.protocol = protocol;
10324
e28265130e4f 7072353: JNDI libraries do not build with javac -Xlint:all -Werror
jjg
parents: 5506
diff changeset
    78
        this.bindCtls = (bindCtls != null ? bindCtls.clone() : null);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    79
        this.trace = trace;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    80
        //
90ce3da70b43 Initial load
duke
parents:
diff changeset
    81
        // Needed for custom socket factory pooling
90ce3da70b43 Initial load
duke
parents:
diff changeset
    82
        //
90ce3da70b43 Initial load
duke
parents:
diff changeset
    83
        this.socketFactory = socketFactory;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    84
        if ((socketFactory != null) &&
90ce3da70b43 Initial load
duke
parents:
diff changeset
    85
             !socketFactory.equals(LdapCtx.DEFAULT_SSL_FACTORY)) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    86
            try {
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10324
diff changeset
    87
                Class<?> socketFactoryClass =
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10324
diff changeset
    88
                        Obj.helper.loadClass(socketFactory);
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    89
                this.sockComparator = socketFactoryClass.getMethod(
25514
3cc6665bb6f4 8048175: Remove redundant use of reflection on core classes from JNDI
prappo
parents: 24969
diff changeset
    90
                                "compare", new Class<?>[]{Object.class, Object.class});
10369
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10324
diff changeset
    91
                Method getDefault = socketFactoryClass.getMethod(
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10324
diff changeset
    92
                                            "getDefault", new Class<?>[]{});
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10324
diff changeset
    93
                this.factory =
e9d2e59e53f0 7059542: JNDI name operations should be locale independent
xuelei
parents: 10324
diff changeset
    94
                        (SocketFactory)getDefault.invoke(null, new Object[]{});
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    95
            } catch (Exception e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    96
                // Ignore it here, the same exceptions are/will be handled by
90ce3da70b43 Initial load
duke
parents:
diff changeset
    97
                // LdapPoolManager and Connection classes.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    98
                if (debug) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    99
                    System.out.println("ClientId received an exception");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   100
                    e.printStackTrace();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   101
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   102
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   103
        } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   104
             isDefaultSockFactory = true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   105
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   106
90ce3da70b43 Initial load
duke
parents:
diff changeset
   107
        // The SocketFactory field is not used in the myHash
90ce3da70b43 Initial load
duke
parents:
diff changeset
   108
        // computation as there is no right way to compute the hash code
90ce3da70b43 Initial load
duke
parents:
diff changeset
   109
        // for this field. There is no harm in skipping it from the hash
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
        // computation
90ce3da70b43 Initial load
duke
parents:
diff changeset
   111
        myHash = version + port
90ce3da70b43 Initial load
duke
parents:
diff changeset
   112
            + (trace != null ? trace.hashCode() : 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   113
            + (this.hostname != null ? this.hostname.hashCode() : 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   114
            + (protocol != null ? protocol.hashCode() : 0)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   115
            + (ctlHash=hashCodeControls(bindCtls));
90ce3da70b43 Initial load
duke
parents:
diff changeset
   116
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   117
90ce3da70b43 Initial load
duke
parents:
diff changeset
   118
    public boolean equals(Object obj) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   119
        if (!(obj instanceof ClientId)) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   120
            return false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   121
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   122
90ce3da70b43 Initial load
duke
parents:
diff changeset
   123
        ClientId other = (ClientId)obj;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   124
90ce3da70b43 Initial load
duke
parents:
diff changeset
   125
        return myHash == other.myHash
90ce3da70b43 Initial load
duke
parents:
diff changeset
   126
            && version == other.version
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
            && port == other.port
90ce3da70b43 Initial load
duke
parents:
diff changeset
   128
            && trace == other.trace
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
            && (hostname == other.hostname // null OK
90ce3da70b43 Initial load
duke
parents:
diff changeset
   130
                || (hostname != null && hostname.equals(other.hostname)))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   131
            && (protocol == other.protocol // null OK
90ce3da70b43 Initial load
duke
parents:
diff changeset
   132
                || (protocol != null && protocol.equals(other.protocol)))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   133
            && ctlHash == other.ctlHash
90ce3da70b43 Initial load
duke
parents:
diff changeset
   134
            && (equalsControls(bindCtls, other.bindCtls))
90ce3da70b43 Initial load
duke
parents:
diff changeset
   135
            && (equalsSockFactory(other));
90ce3da70b43 Initial load
duke
parents:
diff changeset
   136
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   137
90ce3da70b43 Initial load
duke
parents:
diff changeset
   138
    public int hashCode() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   139
        return myHash;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   140
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   141
90ce3da70b43 Initial load
duke
parents:
diff changeset
   142
    private static int hashCodeControls(Control[] c) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   143
        if (c == null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   144
            return 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   145
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   146
90ce3da70b43 Initial load
duke
parents:
diff changeset
   147
        int code = 0;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   148
        for (int i = 0; i < c.length; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   149
            code = code * 31 + c[i].getID().hashCode();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   150
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
        return code;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   152
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   153
90ce3da70b43 Initial load
duke
parents:
diff changeset
   154
    private static boolean equalsControls(Control[] a, Control[] b) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   155
        if (a == b) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   156
            return true;  // both null or same
90ce3da70b43 Initial load
duke
parents:
diff changeset
   157
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   158
        if (a == null || b == null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   159
            return false; // one is non-null
90ce3da70b43 Initial load
duke
parents:
diff changeset
   160
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   161
        if (a.length != b.length) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   162
            return false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   163
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   164
90ce3da70b43 Initial load
duke
parents:
diff changeset
   165
        for (int i = 0; i < a.length; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   166
            if (!a[i].getID().equals(b[i].getID())
90ce3da70b43 Initial load
duke
parents:
diff changeset
   167
                || a[i].isCritical() != b[i].isCritical()
90ce3da70b43 Initial load
duke
parents:
diff changeset
   168
                || !Arrays.equals(a[i].getEncodedValue(),
90ce3da70b43 Initial load
duke
parents:
diff changeset
   169
                    b[i].getEncodedValue())) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   170
                return false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   171
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   172
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   173
        return true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   174
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   175
90ce3da70b43 Initial load
duke
parents:
diff changeset
   176
    private boolean equalsSockFactory(ClientId other) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   177
        if (this.isDefaultSockFactory && other.isDefaultSockFactory) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   178
            return true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   179
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   180
        else if (!other.isDefaultSockFactory) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   181
             return invokeComparator(other, this);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   182
        } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   183
             return invokeComparator(this, other);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   184
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   185
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   186
90ce3da70b43 Initial load
duke
parents:
diff changeset
   187
    // delegate the comparison work to the SocketFactory class
90ce3da70b43 Initial load
duke
parents:
diff changeset
   188
    // as there is no enough information here, to do the comparison
90ce3da70b43 Initial load
duke
parents:
diff changeset
   189
    private boolean invokeComparator(ClientId c1, ClientId c2) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   190
        Object ret;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   191
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   192
            ret = (c1.sockComparator).invoke(
90ce3da70b43 Initial load
duke
parents:
diff changeset
   193
                        c1.factory, c1.socketFactory, c2.socketFactory);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   194
        } catch(Exception e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   195
            if (debug) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   196
                System.out.println("ClientId received an exception");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   197
                e.printStackTrace();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   198
            }
25808
e113d0a0fde0 8054158: Fix typos in JNDI-related packages
prappo
parents: 25514
diff changeset
   199
            // Failed to invoke the comparator; flag inequality
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   200
            return false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   201
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   202
        if (((Integer) ret) == 0) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   203
            return true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   204
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   205
        return false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   206
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   207
90ce3da70b43 Initial load
duke
parents:
diff changeset
   208
    private static String toStringControls(Control[] ctls) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   209
        if (ctls == null) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   210
            return "";
90ce3da70b43 Initial load
duke
parents:
diff changeset
   211
        }
24969
afa6934dd8e8 8041679: Replace uses of StringBuffer with StringBuilder within core library classes
psandoz
parents: 10369
diff changeset
   212
        StringBuilder str = new StringBuilder();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   213
        for (int i = 0; i < ctls.length; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   214
            str.append(ctls[i].getID());
90ce3da70b43 Initial load
duke
parents:
diff changeset
   215
            str.append(' ');
90ce3da70b43 Initial load
duke
parents:
diff changeset
   216
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   217
        return str.toString();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   218
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   219
90ce3da70b43 Initial load
duke
parents:
diff changeset
   220
    public String toString() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   221
        return (hostname + ":" + port + ":" +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   222
            (protocol != null ? protocol : "") + ":" +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   223
            toStringControls(bindCtls) + ":" +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   224
            socketFactory);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   225
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   226
}