jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java
author chegar
Tue, 25 Oct 2016 10:31:49 +0100
changeset 41751 365b2e7c0d2c
parent 39643 04adb120effa
permissions -rw-r--r--
8085192: java/rmi/activation/Activatable tests fail intermittently due to "Port already in use" Reviewed-by: rriggs, mli
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
     1
/*
39643
04adb120effa 8161011: Mark RMI tests DownloadActivationGroup, UseCustomSocketFactory, and RestartService as itnermittent
rhalade
parents: 30820
diff changeset
     2
 * Copyright (c) 1998, 2016, 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
90ce3da70b43 Initial load
duke
parents:
diff changeset
     7
 * published by the Free Software Foundation.
90ce3da70b43 Initial load
duke
parents:
diff changeset
     8
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
     9
 * This code is distributed in the hope that it will be useful, but WITHOUT
90ce3da70b43 Initial load
duke
parents:
diff changeset
    10
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
90ce3da70b43 Initial load
duke
parents:
diff changeset
    11
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
90ce3da70b43 Initial load
duke
parents:
diff changeset
    12
 * version 2 for more details (a copy is included in the LICENSE file that
90ce3da70b43 Initial load
duke
parents:
diff changeset
    13
 * accompanied this code).
90ce3da70b43 Initial load
duke
parents:
diff changeset
    14
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    15
 * You should have received a copy of the GNU General Public License version
90ce3da70b43 Initial load
duke
parents:
diff changeset
    16
 * 2 along with this work; if not, write to the Free Software Foundation,
90ce3da70b43 Initial load
duke
parents:
diff changeset
    17
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
90ce3da70b43 Initial load
duke
parents:
diff changeset
    18
 *
5506
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    19
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    20
 * or visit www.oracle.com if you need additional information or have any
202f599c92aa 6943119: Rebrand source copyright notices
ohair
parents: 2
diff changeset
    21
 * questions.
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    22
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    23
90ce3da70b43 Initial load
duke
parents:
diff changeset
    24
/* @test
90ce3da70b43 Initial load
duke
parents:
diff changeset
    25
 * @bug 4095165 4321151
39643
04adb120effa 8161011: Mark RMI tests DownloadActivationGroup, UseCustomSocketFactory, and RestartService as itnermittent
rhalade
parents: 30820
diff changeset
    26
 * @key intermittent
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    27
 * @summary synopsis: activator should restart daemon services
90ce3da70b43 Initial load
duke
parents:
diff changeset
    28
 * @author Ann Wollrath
90ce3da70b43 Initial load
duke
parents:
diff changeset
    29
 *
90ce3da70b43 Initial load
duke
parents:
diff changeset
    30
 * @library ../../../testlibrary
30820
0d4717a011d3 8081347: Add @modules to jdk_core tests
mchung
parents: 27784
diff changeset
    31
 * @modules java.rmi/sun.rmi.registry
0d4717a011d3 8081347: Add @modules to jdk_core tests
mchung
parents: 27784
diff changeset
    32
 *          java.rmi/sun.rmi.server
0d4717a011d3 8081347: Add @modules to jdk_core tests
mchung
parents: 27784
diff changeset
    33
 *          java.rmi/sun.rmi.transport
0d4717a011d3 8081347: Add @modules to jdk_core tests
mchung
parents: 27784
diff changeset
    34
 *          java.rmi/sun.rmi.transport.tcp
41751
365b2e7c0d2c 8085192: java/rmi/activation/Activatable tests fail intermittently due to "Port already in use"
chegar
parents: 39643
diff changeset
    35
 *          java.base/sun.nio.ch
365b2e7c0d2c 8085192: java/rmi/activation/Activatable tests fail intermittently due to "Port already in use"
chegar
parents: 39643
diff changeset
    36
 * @build TestLibrary RMID RMIDSelectorProvider ActivationLibrary ActivateMe RestartService_Stub
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
    37
 * @run main/othervm/policy=security.policy/timeout=240 RestartService
90ce3da70b43 Initial load
duke
parents:
diff changeset
    38
 */
90ce3da70b43 Initial load
duke
parents:
diff changeset
    39
90ce3da70b43 Initial load
duke
parents:
diff changeset
    40
import java.io.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    41
import java.rmi.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    42
import java.rmi.activation.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    43
import java.rmi.server.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    44
import java.rmi.registry.*;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    45
import java.util.Vector;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    46
import java.util.Properties;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    47
90ce3da70b43 Initial load
duke
parents:
diff changeset
    48
public class RestartService
90ce3da70b43 Initial load
duke
parents:
diff changeset
    49
        implements ActivateMe, Runnable
90ce3da70b43 Initial load
duke
parents:
diff changeset
    50
{
90ce3da70b43 Initial load
duke
parents:
diff changeset
    51
90ce3da70b43 Initial load
duke
parents:
diff changeset
    52
    private ActivationID id;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    53
    private static Object lock = new Object();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    54
    private Vector responders = new Vector();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    55
90ce3da70b43 Initial load
duke
parents:
diff changeset
    56
    private static final String RESTARTABLE = "restartable";
90ce3da70b43 Initial load
duke
parents:
diff changeset
    57
    private static final String ACTIVATABLE = "activatable";
90ce3da70b43 Initial load
duke
parents:
diff changeset
    58
90ce3da70b43 Initial load
duke
parents:
diff changeset
    59
90ce3da70b43 Initial load
duke
parents:
diff changeset
    60
    public RestartService(ActivationID id, MarshalledObject mobj)
90ce3da70b43 Initial load
duke
parents:
diff changeset
    61
        throws ActivationException, RemoteException
90ce3da70b43 Initial load
duke
parents:
diff changeset
    62
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    63
        this.id = id;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    64
        Activatable.exportObject(this, id, 0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    65
        ActivateMe obj;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    66
        String responder;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    67
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    68
            Object[] stuff = (Object[]) mobj.get();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    69
            responder = (String) stuff[0];
90ce3da70b43 Initial load
duke
parents:
diff changeset
    70
            System.err.println(responder + " service started");
90ce3da70b43 Initial load
duke
parents:
diff changeset
    71
            obj = (ActivateMe) stuff[1];
90ce3da70b43 Initial load
duke
parents:
diff changeset
    72
        } catch (Exception e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    73
            System.err.println("unable to obtain stub from marshalled object");
90ce3da70b43 Initial load
duke
parents:
diff changeset
    74
            return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
    75
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    76
90ce3da70b43 Initial load
duke
parents:
diff changeset
    77
        obj.ping(responder);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    78
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    79
90ce3da70b43 Initial load
duke
parents:
diff changeset
    80
    public RestartService() throws RemoteException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    81
        UnicastRemoteObject.exportObject(this, 0);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    82
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    83
90ce3da70b43 Initial load
duke
parents:
diff changeset
    84
    public void ping(String responder) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    85
        System.err.println("RestartService: received ping from " + responder);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    86
        synchronized (lock) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    87
            responders.add(responder);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    88
            lock.notify();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    89
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    90
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    91
90ce3da70b43 Initial load
duke
parents:
diff changeset
    92
    public boolean receivedPing(String responder) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    93
        return responders.contains(responder);
90ce3da70b43 Initial load
duke
parents:
diff changeset
    94
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    95
90ce3da70b43 Initial load
duke
parents:
diff changeset
    96
    public ActivateMe getUnicastVersion() throws RemoteException {
90ce3da70b43 Initial load
duke
parents:
diff changeset
    97
        return new RestartService();
90ce3da70b43 Initial load
duke
parents:
diff changeset
    98
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
    99
90ce3da70b43 Initial load
duke
parents:
diff changeset
   100
    public ActivationID getID() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   101
        return id;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   102
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   103
90ce3da70b43 Initial load
duke
parents:
diff changeset
   104
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   105
     * Spawns a thread to deactivate the object.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   106
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   107
    public void shutdown() throws Exception
90ce3da70b43 Initial load
duke
parents:
diff changeset
   108
    {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   109
        (new Thread(this,"RestartService")).start();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   110
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   111
90ce3da70b43 Initial load
duke
parents:
diff changeset
   112
    /**
90ce3da70b43 Initial load
duke
parents:
diff changeset
   113
     * Thread to deactivate object. First attempts to make object
90ce3da70b43 Initial load
duke
parents:
diff changeset
   114
     * inactive (via the inactive method).  If that fails (the
90ce3da70b43 Initial load
duke
parents:
diff changeset
   115
     * object may still have pending/executing calls), then
90ce3da70b43 Initial load
duke
parents:
diff changeset
   116
     * unexport the object forcibly.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   117
     */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   118
    public void run() {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   119
90ce3da70b43 Initial load
duke
parents:
diff changeset
   120
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   121
90ce3da70b43 Initial load
duke
parents:
diff changeset
   122
    public static void main(String[] args) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   123
90ce3da70b43 Initial load
duke
parents:
diff changeset
   124
        System.out.println("\nRegression test for bug 4095165\n");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   125
90ce3da70b43 Initial load
duke
parents:
diff changeset
   126
        TestLibrary.suggestSecurityManager("java.rmi.RMISecurityManager");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   127
90ce3da70b43 Initial load
duke
parents:
diff changeset
   128
        RMID rmid = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   129
        RestartService unicastObj = null;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   130
90ce3da70b43 Initial load
duke
parents:
diff changeset
   131
        try {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   132
            RMID.removeLog();
41751
365b2e7c0d2c 8085192: java/rmi/activation/Activatable tests fail intermittently due to "Port already in use"
chegar
parents: 39643
diff changeset
   133
            rmid = RMID.createRMIDOnEphemeralPort();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   134
            rmid.start();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   135
90ce3da70b43 Initial load
duke
parents:
diff changeset
   136
            /* Cause activation groups to have a security policy that will
90ce3da70b43 Initial load
duke
parents:
diff changeset
   137
             * allow security managers to be downloaded and installed
90ce3da70b43 Initial load
duke
parents:
diff changeset
   138
             */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   139
            Properties p = new Properties();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   140
            // this test must always set policies/managers in its
90ce3da70b43 Initial load
duke
parents:
diff changeset
   141
            // activation groups
90ce3da70b43 Initial load
duke
parents:
diff changeset
   142
            p.put("java.security.policy",
90ce3da70b43 Initial load
duke
parents:
diff changeset
   143
                  TestParams.defaultGroupPolicy);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   144
            p.put("java.security.manager",  "");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   145
90ce3da70b43 Initial load
duke
parents:
diff changeset
   146
            /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   147
             * Create unicast object to be contacted when service is activated.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   148
             */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   149
            unicastObj = new RestartService();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   150
            /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   151
             * Create and register descriptors for a restartable and
90ce3da70b43 Initial load
duke
parents:
diff changeset
   152
             * non-restartable service (respectively) in a group other than
90ce3da70b43 Initial load
duke
parents:
diff changeset
   153
             * this VM's group.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   154
             */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   155
            System.err.println("Creating descriptors");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   156
90ce3da70b43 Initial load
duke
parents:
diff changeset
   157
            Object[] stuff = new Object[] { RESTARTABLE, unicastObj };
90ce3da70b43 Initial load
duke
parents:
diff changeset
   158
            MarshalledObject restartMobj = new MarshalledObject(stuff);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   159
            ActivationGroupDesc groupDesc =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   160
                new ActivationGroupDesc(p, null);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   161
90ce3da70b43 Initial load
duke
parents:
diff changeset
   162
            stuff[0] = ACTIVATABLE;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   163
            MarshalledObject activateMobj = new MarshalledObject(stuff);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   164
            ActivationGroupID groupID =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   165
                ActivationGroup.getSystem().registerGroup(groupDesc);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   166
            ActivationDesc restartableDesc =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   167
                new ActivationDesc(groupID, "RestartService", null,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   168
                                   restartMobj, true);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   169
90ce3da70b43 Initial load
duke
parents:
diff changeset
   170
            ActivationDesc activatableDesc =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   171
                new ActivationDesc(groupID, "RestartService", null,
90ce3da70b43 Initial load
duke
parents:
diff changeset
   172
                                   activateMobj, false);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   173
90ce3da70b43 Initial load
duke
parents:
diff changeset
   174
            System.err.println("Registering descriptors");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   175
            ActivateMe restartableObj =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   176
                (ActivateMe) Activatable.register(restartableDesc);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   177
90ce3da70b43 Initial load
duke
parents:
diff changeset
   178
            ActivateMe activatableObj =
90ce3da70b43 Initial load
duke
parents:
diff changeset
   179
                (ActivateMe) Activatable.register(activatableDesc);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   180
90ce3da70b43 Initial load
duke
parents:
diff changeset
   181
            /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   182
             * Restart rmid; it should start up the restartable service
90ce3da70b43 Initial load
duke
parents:
diff changeset
   183
             */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   184
            rmid.restart();
90ce3da70b43 Initial load
duke
parents:
diff changeset
   185
90ce3da70b43 Initial load
duke
parents:
diff changeset
   186
            /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   187
             * Wait for service to be automatically restarted.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   188
             */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   189
            boolean gotPing = false;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   190
            for (int i = 0; i < 15; i++) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   191
                synchronized (lock) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   192
                    if (unicastObj.receivedPing(RESTARTABLE) != true) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   193
                        lock.wait(5000);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   194
                        if (unicastObj.receivedPing(RESTARTABLE) == true) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   195
                            System.err.println("Test1 passed: rmid restarted" +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   196
                                               " service");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   197
                            gotPing = true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   198
                            break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   199
                        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   200
                    } else {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   201
                        gotPing = true;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   202
                        break;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   203
                    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   204
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   205
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   206
90ce3da70b43 Initial load
duke
parents:
diff changeset
   207
            if (gotPing == false)
90ce3da70b43 Initial load
duke
parents:
diff changeset
   208
                TestLibrary.bomb("Test1 failed: service not restarted by timeout", null);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   209
90ce3da70b43 Initial load
duke
parents:
diff changeset
   210
            /*
90ce3da70b43 Initial load
duke
parents:
diff changeset
   211
             * Make sure activatable services wasn't automatically restarted.
90ce3da70b43 Initial load
duke
parents:
diff changeset
   212
             */
90ce3da70b43 Initial load
duke
parents:
diff changeset
   213
            synchronized (lock) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   214
                if (unicastObj.receivedPing(ACTIVATABLE) != true) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   215
                    lock.wait(5000);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   216
                    if (unicastObj.receivedPing(ACTIVATABLE) != true) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   217
                        System.err.println("Test2 passed: rmid did not " +
90ce3da70b43 Initial load
duke
parents:
diff changeset
   218
                                           "restart activatable service");
90ce3da70b43 Initial load
duke
parents:
diff changeset
   219
                        return;
90ce3da70b43 Initial load
duke
parents:
diff changeset
   220
                    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   221
                }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   222
90ce3da70b43 Initial load
duke
parents:
diff changeset
   223
                TestLibrary.bomb("Test2 failed: activatable service restarted!", null);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   224
            }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   225
90ce3da70b43 Initial load
duke
parents:
diff changeset
   226
90ce3da70b43 Initial load
duke
parents:
diff changeset
   227
        } catch (Exception e) {
90ce3da70b43 Initial load
duke
parents:
diff changeset
   228
            TestLibrary.bomb("test failed", e);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   229
        } finally {
27784
a51d6d4e0528 8035000: clean up ActivationLibrary.DestroyThread
smarks
parents: 23010
diff changeset
   230
            rmid.cleanup();
2
90ce3da70b43 Initial load
duke
parents:
diff changeset
   231
            TestLibrary.unexport(unicastObj);
90ce3da70b43 Initial load
duke
parents:
diff changeset
   232
        }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   233
    }
90ce3da70b43 Initial load
duke
parents:
diff changeset
   234
}